diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt
index 13bdd2518d..442e360818 100644
--- a/metadata/com.nononsenseapps.notepad.txt
+++ b/metadata/com.nononsenseapps.notepad.txt
@@ -82,7 +82,7 @@ Build:5.5,55000
 Build:5.5.1,55100
     commit=5.5.1
     subdir=app
-    patch=remove_play_configs-55100.patch
+    patch=remove_play_configs.patch
     gradle=free
     srclibs=Orgparser@7ab685e517e2e00c94b11ca58626bba19cb9300a
     rm=app/libs/*.jar
@@ -93,7 +93,7 @@ Build:5.5.1,55100
 Build:5.5.3,55300
     commit=5.5.3
     subdir=app
-    patch=remove_play_configs.patch
+    patch=remove_play_configs-55300.patch
     gradle=free
     srclibs=Orgparser@7ab685e517e2e00c94b11ca58626bba19cb9300a
     rm=app/libs/*.jar
diff --git a/metadata/com.nononsenseapps.notepad/remove_play_configs-55100.patch b/metadata/com.nononsenseapps.notepad/remove_play_configs-55300.patch
similarity index 77%
rename from metadata/com.nononsenseapps.notepad/remove_play_configs-55100.patch
rename to metadata/com.nononsenseapps.notepad/remove_play_configs-55300.patch
index e47117253d..49d7226ae7 100644
--- a/metadata/com.nononsenseapps.notepad/remove_play_configs-55100.patch
+++ b/metadata/com.nononsenseapps.notepad/remove_play_configs-55300.patch
@@ -1,18 +1,8 @@
-From 138239b76870e1297d205679a4ff26b6e16eb552 Mon Sep 17 00:00:00 2001
-From: Jonas Kalderstam <jonas@kalderstam.se>
-Date: Wed, 29 Oct 2014 15:34:42 +0100
-Subject: [PATCH] Remove play configs for fdroid
-
-Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
----
- app/build.gradle | 45 ---------------------------------------------
- 1 file changed, 45 deletions(-)
-
-diff --git a/app/build.gradle b/app/build.gradle
-index 94f54fe..7ca8a43 100644
---- a/app/build.gradle
-+++ b/app/build.gradle
-@@ -83,27 +83,6 @@ android {
+diff --git c/app/build.gradle w/app/build.gradle
+index 438147e..3258181 100644
+--- c/app/build.gradle
++++ w/app/build.gradle
+@@ -78,27 +78,6 @@ android {
  
      productFlavors {
          free {}
@@ -40,7 +30,7 @@ index 94f54fe..7ca8a43 100644
      }
  
      if (project.hasProperty('STORE_FILE')) {
-@@ -143,20 +122,6 @@ apt {
+@@ -129,20 +108,6 @@ apt {
      }
  }
  
@@ -61,7 +51,7 @@ index 94f54fe..7ca8a43 100644
  dependencies {
      compile fileTree(dir: 'libs', include: '*.jar')
      compile 'com.android.support:support-v4:19.0.1+'
-@@ -170,14 +135,4 @@ dependencies {
+@@ -158,14 +123,4 @@ dependencies {
      // annotations
      apt "org.androidannotations:androidannotations:$AAVersion"
      compile "org.androidannotations:androidannotations-api:$AAVersion"
@@ -75,8 +65,6 @@ index 94f54fe..7ca8a43 100644
 -    // Tests
 -    androidTestCompile 'com.squareup.spoon:spoon-client:1.1.1+'
 -
- }
+-}
++}
 \ No newline at end of file
--- 
-2.1.1
-
diff --git a/metadata/com.nononsenseapps.notepad/remove_play_configs.patch b/metadata/com.nononsenseapps.notepad/remove_play_configs.patch
index 49d7226ae7..e47117253d 100644
--- a/metadata/com.nononsenseapps.notepad/remove_play_configs.patch
+++ b/metadata/com.nononsenseapps.notepad/remove_play_configs.patch
@@ -1,8 +1,18 @@
-diff --git c/app/build.gradle w/app/build.gradle
-index 438147e..3258181 100644
---- c/app/build.gradle
-+++ w/app/build.gradle
-@@ -78,27 +78,6 @@ android {
+From 138239b76870e1297d205679a4ff26b6e16eb552 Mon Sep 17 00:00:00 2001
+From: Jonas Kalderstam <jonas@kalderstam.se>
+Date: Wed, 29 Oct 2014 15:34:42 +0100
+Subject: [PATCH] Remove play configs for fdroid
+
+Signed-off-by: Jonas Kalderstam <jonas@kalderstam.se>
+---
+ app/build.gradle | 45 ---------------------------------------------
+ 1 file changed, 45 deletions(-)
+
+diff --git a/app/build.gradle b/app/build.gradle
+index 94f54fe..7ca8a43 100644
+--- a/app/build.gradle
++++ b/app/build.gradle
+@@ -83,27 +83,6 @@ android {
  
      productFlavors {
          free {}
@@ -30,7 +40,7 @@ index 438147e..3258181 100644
      }
  
      if (project.hasProperty('STORE_FILE')) {
-@@ -129,20 +108,6 @@ apt {
+@@ -143,20 +122,6 @@ apt {
      }
  }
  
@@ -51,7 +61,7 @@ index 438147e..3258181 100644
  dependencies {
      compile fileTree(dir: 'libs', include: '*.jar')
      compile 'com.android.support:support-v4:19.0.1+'
-@@ -158,14 +123,4 @@ dependencies {
+@@ -170,14 +135,4 @@ dependencies {
      // annotations
      apt "org.androidannotations:androidannotations:$AAVersion"
      compile "org.androidannotations:androidannotations-api:$AAVersion"
@@ -65,6 +75,8 @@ index 438147e..3258181 100644
 -    // Tests
 -    androidTestCompile 'com.squareup.spoon:spoon-client:1.1.1+'
 -
--}
-+}
+ }
 \ No newline at end of file
+-- 
+2.1.1
+