diff --git a/mk/bzip2/ndk-issue399.patch b/mk/bzip2/ndk-issue399.patch
new file mode 100644
index 00000000..94cee0a5
--- /dev/null
+++ b/mk/bzip2/ndk-issue399.patch
@@ -0,0 +1,11 @@
+--- bzip2-1.0.6/Makefile.orig	2017-05-18 14:37:41.598810141 +0800
++++ bzip2-1.0.6/Makefile	2017-05-18 14:37:51.941841315 +0800
+@@ -21,7 +21,7 @@
+ LDFLAGS?=
+ 
+ BIGFILES=-D_FILE_OFFSET_BITS=64
+-CFLAGS+=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS+=-Wall -Winline -O2 $(BIGFILES)
+ 
+ # Where you want it installed when you do 'make install'
+ PREFIX?=/usr/local
diff --git a/mk/python/ndk-issue399.patch b/mk/python/ndk-issue399.patch
new file mode 100644
index 00000000..fd7afc18
--- /dev/null
+++ b/mk/python/ndk-issue399.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index e065ce554b..de794d9faa 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1477,7 +1477,7 @@ then
+                     OPT="-g -O0 -Wall"
+                 fi
+ 	    else
+-		OPT="-g $WRAP -O3 -Wall"
++		OPT="$WRAP -O3 -Wall"
+ 	    fi
+ 	    ;;
+ 	*)
diff --git a/pybuild/packages/bzip2.py b/pybuild/packages/bzip2.py
index 0ce71b07..429ce67a 100644
--- a/pybuild/packages/bzip2.py
+++ b/pybuild/packages/bzip2.py
@@ -7,6 +7,7 @@ class BZip2(Package):
     source = URLSource('http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz')
     patches = [
         LocalPatch('makefiles'),
+        LocalPatch('ndk-issue399'),
     ]
 
     def __init__(self):
diff --git a/pybuild/packages/python.py b/pybuild/packages/python.py
index b9f35d4d..9a3e821e 100644
--- a/pybuild/packages/python.py
+++ b/pybuild/packages/python.py
@@ -15,6 +15,7 @@ class Python(Package):
         LocalPatch('cppflags'),
         LocalPatch('ldflags-last'),
         LocalPatch('skip-build'),
+        LocalPatch('ndk-issue399'),
     ]
 
     def __init__(self):