diff --git a/rpmlint-pie-fixes.patch b/rpmlint-pie-fixes.patch
new file mode 100644
index 0000000..c0f1655
--- /dev/null
+++ b/rpmlint-pie-fixes.patch
@@ -0,0 +1,32 @@
+Index: rpmlint-tests-13.2+git20150310.00c9b55/tests/pie.spec
+===================================================================
+--- rpmlint-tests-13.2+git20150310.00c9b55.orig/tests/pie.spec
++++ rpmlint-tests-13.2+git20150310.00c9b55/tests/pie.spec
+@@ -20,7 +20,10 @@ officia deserunt mollit anim id est labo
+ %build
+ 
+ %install
+-install -D -m 755 /bin/ls %buildroot/usr/bin/telnet
++mkdir -p %buildroot/usr/bin/
++echo "int main() {}" >xx.c
++gcc -O2 -fno-PIE xx.c -o     %buildroot/usr/bin/telnet
++strip %buildroot/usr/bin/telnet
+ install -D -m 755 /bin/mount %buildroot/bin/mount
+ 
+ 
+Index: rpmlint-tests-13.2+git20150310.00c9b55/tests/permissions1.spec
+===================================================================
+--- rpmlint-tests-13.2+git20150310.00c9b55.orig/tests/permissions1.spec
++++ rpmlint-tests-13.2+git20150310.00c9b55/tests/permissions1.spec
+@@ -23,7 +23,10 @@ officia deserunt mollit anim id est labo
+ install -d -m 755 %buildroot/etc/permissions.d
+ install -d -m 755 %buildroot/bin
+ echo "/bin/foo root:root 4755" > %buildroot/etc/permissions.d/test
+-cp /bin/ls %buildroot/bin
++
++echo "int main() {}" > xx.c
++gcc -fno-PIE -O2 xx.c -o %buildroot/bin/ls
++strip %buildroot/bin/ls
+ cp /bin/su %buildroot/bin
+ 
+ %clean
diff --git a/rpmlint-tests.changes b/rpmlint-tests.changes
index 261a13c..635a4a5 100644
--- a/rpmlint-tests.changes
+++ b/rpmlint-tests.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  9 14:00:19 UTC 2015 - meissner@suse.com
+
+- rpmlint-pie-fixes.patch: build own non-pie binaries to avoid
+  relying on random system binaries.
+
 -------------------------------------------------------------------
 Tue Mar 10 12:55:04 UTC 2015 - lnussel@suse.de
 
diff --git a/rpmlint-tests.spec b/rpmlint-tests.spec
index 179814c..e2484e4 100644
--- a/rpmlint-tests.spec
+++ b/rpmlint-tests.spec
@@ -30,6 +30,7 @@ Group:          Development/Tools/Building
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.opensuse.org/
 Source:         rpmlint-tests-%version.tar.xz
+Patch0:         rpmlint-pie-fixes.patch
 
 %description
 This package doesn't actually contain any files and is not meant to
@@ -38,6 +39,7 @@ regression tests against rpmlint(-mini).
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 mkdir rpms