diff --git a/0020-build-Fix-DESTDIR-dont-update-docs.patch b/0020-build-Fix-DESTDIR-dont-update-docs.patch
new file mode 100644
index 0000000..c31d14c
--- /dev/null
+++ b/0020-build-Fix-DESTDIR-dont-update-docs.patch
@@ -0,0 +1,60 @@
+From 89f10c5f0c4374fb8ac51f1878b8b79329123c5b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 25 Jan 2017 16:35:50 +0100
+Subject: [PATCH] fix
+
+---
+ .../Makefile                                       | 22 +++++-----------------
+ 1 file changed, 5 insertions(+), 17 deletions(-)
+
+diff --git a/iguanair-lirc-e23b9d3726b010c9e747786ffe72e38debc8cfef/Makefile b/iguanair-lirc-e23b9d3726b010c9e747786ffe72e38debc8cfef/Makefile
+index dd093eb..be86c43 100755
+--- a/iguanair-lirc-e23b9d3726b010c9e747786ffe72e38debc8cfef/Makefile
++++ b/iguanair-lirc-e23b9d3726b010c9e747786ffe72e38debc8cfef/Makefile
+@@ -3,9 +3,6 @@
+ # Requires that lirc is installed in system locations, in
+ # particular that the /usr/lib[64]/pkgconfig/lirc-driver.pc
+ # is in place (/usr/local/lib/pkgconfig/... is also OK).
+-# The required file plugindocs.mk might live in a -doc
+-# package which then is needed.
+-#
+ 
+ 
+ driver          = iguanair
+@@ -18,13 +15,7 @@ PLUGINDIR       ?= $(shell pkg-config --variable=plugindir lirc-driver)
+ CONFIGDIR       ?= $(shell pkg-config --variable=configdir lirc-driver)
+ PLUGINDOCS      ?= $(shell pkg-config --variable=plugindocs lirc-driver)
+ 
+-PLUGINDOCS_MK   = $(PLUGINDOCS)/plugindocs.mk
+-MODPROBE_CONF   = 60-blacklist-kernel-iguanair.conf
+-
+-ifneq ($(wildcard $(PLUGINDOCS_MK)),)
+-	include $(PLUGINDOCS_MK)
+-endif
+-
++MODPROBE_CONF    = 60-blacklist-kernel-iguanair.conf
+ 
+ $(driver).o: $(driver).c
+ 
+@@ -32,14 +23,11 @@ $(driver).so: $(driver).o
+ 	gcc --shared -fpic $(LDFLAGS) -o $@ $<
+ 
+ install: $(driver).so
+-	install -pDm 755 $< $(DESTDIR)$(PLUGINDIR)/$<
+-	install -pDm 644 $(driver).html $(DESTDIR)$(PLUGINDOCS)/$(driver).html
+-	install -pDm 644 $(driver).conf $(DESTDIR)$(CONFIGDIR)/$(driver).conf
+-	install -pDm 644 $(MODPROBE_CONF) \
++	install -D $<  $(DESTDIR)$(PLUGINDIR)/$<
++	install -D $(driver).conf  $(DESTDIR)$(CONFIGDIR)/$(driver).conf
++	install -D $(driver).html $(DESTDIR)$(PLUGINDOCS)/$(driver).html
++	install -Dm 644 $(MODPROBE_CONF) \
+ 	    $(DESTDIR)/etc/modprobe.d/$(MODPROBE_CONF)
+-ifneq ($(wildcard $(PLUGINDOCS_MK)),)
+-	$(MAKE) update
+-endif
+ 
+ clean:
+ 	rm -f *.o *.so
+-- 
+2.9.3
+
diff --git a/0020-dont-update-docs.patch b/0020-dont-update-docs.patch
deleted file mode 100644
index 76c142b..0000000
--- a/0020-dont-update-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile	2017-01-25 10:15:24.889155859 +0100
-+++ b/Makefile	2017-01-25 10:15:52.311625145 +0100
-@@ -38,7 +38,4 @@
- 	install -pDm 644 $(MODPROBE_CONF) \
- 	    $(DESTDIR)/etc/modprobe.d/$(MODPROBE_CONF)
--ifneq ($(wildcard $(PLUGINDOCS_MK)),)
--	$(MAKE) update
--endif
- 
- clean:
diff --git a/iguanaIR.spec b/iguanaIR.spec
index 127b4c8..ec2da22 100644
--- a/iguanaIR.spec
+++ b/iguanaIR.spec
@@ -29,11 +29,13 @@ Source11:       0011-Rename-link-README-files-to-match-modified-install-r.patch
 Source12:       0012-Makefile-Add-DESTDIR-support.patch
 Source13:       0013-Convert-all-files-to-LF-line-endings-like-main-drive.patch
 
-Source20:       0020-dont-update-docs.patch
+Source20:       0020-build-Fix-DESTDIR-dont-update-docs.patch
 
 Requires:       udev
 
 BuildRequires:  cmake
+BuildRequires:  dos2unix
+BuildRequires:  git
 BuildRequires:  libusb1-devel, libusb-devel
 BuildRequires:  popt-devel
 BuildRequires:  systemd-units
@@ -99,24 +101,33 @@ cd iguanair-lirc-%{commit6}
 patch -p1 < %{SOURCE10}
 patch -p1 < %{SOURCE11}
 patch -p1 < %{SOURCE12}
-patch -p1 < %{SOURCE20}
 git apply --whitespace=fix %{SOURCE13}
+dos2unix Makefile
+patch -l -p2 --fuzz 2 < %{SOURCE20}
 
 
 %build
 ./runCmake -DLIBDIR="%{_libdir}"
 cd build
-make CFLAGS="%{optflags} -fpic -DFEDORA=1" %{?_smp_mflags}
+make CFLAGS="%{optflags} -fpic -DFEDORA=1 -DHAVE_KERNEL_LIRC_H=1 -I.." %{?_smp_mflags}
 cp %{SOURCE4} .
 
 
 %install
 %if 0%{fedora} > 23
 cd iguanair-lirc-%{commit6}
-make DESTDIR=$RPM_BUILD_ROOT install
+PLUGINDOCS=$(pkg-config --variable=plugindocs lirc-driver)
+make CFLAGS="%{optflags} \
+    -fpic -I.. -DHAVE_KERNEL_LIRC_H=1 -DPLUGINDOCS=\\\"$PLUGINDOCS\\\"" \
+    DESTDIR=$RPM_BUILD_ROOT install
 cd ..
 %endif
 
+mkdir -p $RPM_BUILD_ROOT/%{_datadir} || :
+cp -ar files/python/usr/share/iguanaIR-reflasher $RPM_BUILD_ROOT/%{_datadir}
+mkdir -p $RPM_BUILD_ROOT/%{_bindir} || :
+cp -ar files/python/usr/bin/* $RPM_BUILD_ROOT/%{_bindir}
+
 cd build
 make install PREFIX=$RPM_BUILD_ROOT/usr DESTDIR=$RPM_BUILD_ROOT \
     INLIBDIR=$RPM_BUILD_ROOT%{_libdir}