diff --git a/device-mapper-persistent-data-0.2.1-nostrip.patch b/device-mapper-persistent-data-0.2.1-nostrip.patch
new file mode 100644
index 0000000..c75a4fa
--- /dev/null
+++ b/device-mapper-persistent-data-0.2.1-nostrip.patch
@@ -0,0 +1,20 @@
+diff -up thin-provisioning-tools-0.2.1/Makefile.in~ thin-provisioning-tools-0.2.1/Makefile.in
+--- thin-provisioning-tools-0.2.1/Makefile.in~	2013-07-10 18:43:45.000000000 +0300
++++ thin-provisioning-tools-0.2.1/Makefile.in	2013-07-15 22:32:36.294852451 +0300
+@@ -235,11 +235,11 @@ distclean: clean
+ 
+ install: $(PROGRAMS)
+ 	$(INSTALL_DIR) $(BINDIR)
+-	$(INSTALL_PROGRAM) -s thin_check $(BINDIR)
+-	$(INSTALL_PROGRAM) -s thin_dump $(BINDIR)
+-	$(INSTALL_PROGRAM) -s thin_repair $(BINDIR)
+-	$(INSTALL_PROGRAM) -s thin_restore $(BINDIR)
+-	$(INSTALL_PROGRAM) -s thin_rmap $(BINDIR)
++	$(INSTALL_PROGRAM) thin_check $(BINDIR)
++	$(INSTALL_PROGRAM) thin_dump $(BINDIR)
++	$(INSTALL_PROGRAM) thin_repair $(BINDIR)
++	$(INSTALL_PROGRAM) thin_restore $(BINDIR)
++	$(INSTALL_PROGRAM) thin_rmap $(BINDIR)
+ 	$(INSTALL_DIR) $(MANPATH)/man8
+ 	$(INSTALL_DATA) man8/thin_check.8 $(MANPATH)/man8
+ 	$(INSTALL_DATA) man8/thin_dump.8 $(MANPATH)/man8
diff --git a/device-mapper-persistent-data.spec b/device-mapper-persistent-data.spec
index a9f4064..080af40 100644
--- a/device-mapper-persistent-data.spec
+++ b/device-mapper-persistent-data.spec
@@ -4,12 +4,13 @@
 Summary: Device-mapper thin provisioning tools
 Name: device-mapper-persistent-data
 Version: 0.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Base
 URL: https://github.com/jthornber/thin-provisioning-tools
 Source0: https://github.com/jthornber/thin-provisioning-tools/archive/thin-provisioning-tools-v%{version}.tar.bz2
 # Source1: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version}.tar.gz
+Patch0: %{name}-0.2.1-nostrip.patch
 BuildRequires: autoconf, expat-devel, libstdc++-devel, boost-devel
 Requires: expat
 
@@ -19,11 +20,12 @@ manage device-mapper thin provisioning target metadata devices.
 
 %prep
 %setup -q -n thin-provisioning-tools-%{version}
+%patch0 -p1
 
 %build
 autoconf
-%configure
-make %{?_smp_mflags}
+%configure --with-optimisation=
+make %{?_smp_mflags} V=
 
 %install
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
@@ -42,6 +44,12 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
 %{_sbindir}/thin_rmap
 
 %changelog
+* Tue Jul 16 2013 Heinz Mauelshagen <heinzm@redhat.com> - 0.2.1-2
+- Build with nostrip fix from Ville Skyttä
+
+* Mon Jul 15 2013 Ville Skyttä <ville.skytta@iki.fi> - 0.2.1-2
+- Let rpmbuild strip binaries, don't override optflags, build more verbose.
+
 * Fri Jul 12 2013 Heinz Mauelshagen <heinzm@redhat.com> - 0.2.1-1
 - New upstream version.