diff --git a/.SRCINFO b/.SRCINFO
index b91b62c3cd5f0..ce6eb794595ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = unp64
 	pkgdesc = Generic C64 prg unpacker
 	pkgver = 2.37
-	pkgrel = 1
+	pkgrel = 2
 	url = http://iancoog.altervista.org/
 	arch = x86_64
 	license = unknown
 	source = http://iancoog.altervista.org/C/unp64_237.7z
-	md5sums = 6f533cbeef28ad026058bd74116edcb3
+	source = ul-args-parse.patch
+	md5sums = 00c54d72da1b6ab27b1b6f6193608d4e
+	md5sums = 967a5c268d71151d42c57c73e8bb7412
 
 pkgname = unp64
diff --git a/PKGBUILD b/PKGBUILD
index b2a29bc2409c8..3c9e5a7a93fb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,22 @@
 
 pkgname=unp64
 pkgver=2.37
-pkgrel=1
+pkgrel=2
 pkgdesc='Generic C64 prg unpacker'
 url='http://iancoog.altervista.org/'
 license=('unknown')
 arch=('x86_64')
-source=("http://iancoog.altervista.org/C/unp64_${pkgver/./}.7z")
-md5sums=('6f533cbeef28ad026058bd74116edcb3')
+source=(
+  "http://iancoog.altervista.org/C/unp64_${pkgver/./}.7z"
+  "ul-args-parse.patch"
+)
+md5sums=('00c54d72da1b6ab27b1b6f6193608d4e'
+         '967a5c268d71151d42c57c73e8bb7412')
+
+prepare() {
+  echo $(pwd)
+  patch -Np1 -d "unp64_${pkgver/./}" -i ../ul-args-parse.patch
+}
 
 build() {
   cd "${srcdir}/unp64_${pkgver/./}/src"
diff --git a/ul-args-parse.patch b/ul-args-parse.patch
new file mode 100644
index 0000000000000..05b3792c1963d
--- /dev/null
+++ b/ul-args-parse.patch
@@ -0,0 +1,22 @@
+diff --git a/src/unp64.c b/src/unp64.c
+index 800c8a3..4ede1dd 100644
+--- a/src/unp64.c
++++ b/src/unp64.c
+@@ -496,7 +496,7 @@ looprecurse:
+                 case 'u':
+                     Unp.WrMemF=1;
+                     printf("Clean unwritten memory\n");
+-                    if (argv[p]+2)
++                    if (argv[p][2])
+                     {
+                     	str_to_int(argv[p]+2, &Unp.WrMemV);
+                         q=Unp.WrMemV&0xff;
+@@ -509,7 +509,7 @@ looprecurse:
+                 case 'l':
+                     Unp.LfMemF=info->end;
+                     printf("Clean memory-end leftovers\n");
+-                    if (argv[p]+2)
++                    if (argv[p][2])
+                     {
+                     	str_to_int(argv[p]+2, &Unp.LfMemV);
+                     }