diff --git a/Makefile b/Makefile
index e03c782..52a2b42 100644
--- a/Makefile
+++ b/Makefile
@@ -291,12 +291,15 @@ $(PREFIX)/bin/fd2sfd: build/fd2sfd/Makefile $(shell find 2>/dev/null projects/fd
 	mkdir -p $(PREFIX)/bin/
 	$(MAKE) -C build/fd2sfd install $(LOG)
 build/fd2sfd/Makefile: projects/fd2sfd/configure
+	for i in $$(find patches/fd2sfd/ -type f); \
+	do if [[ "$$i" == *.diff ]] ; \
+		then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done
 	@mkdir -p build/fd2sfd
-	cd build/fd2sfd && $(E) $(PWD)/projects/fd2sfd/configure $(CONFIG_FD2SFD) $(LOG)
+	cd build/fd2sfd && $(E) ../../projects/fd2sfd/configure $(CONFIG_FD2SFD) $(LOG)
 
 projects/fd2sfd/configure:
 	@mkdir -p projects
-	cd projects &&	git clone -b master --depth 4 https://github.com/SteveMoody73/fd2sfd
+	cd projects &&	git clone -b master --depth 4 https://github.com/cahirwpz/fd2sfd
 
 # =================================================
 # fd2pragma
@@ -313,7 +316,7 @@ $(PREFIX)/bin/fd2pragma: build/fd2pragma/fd2pragma
 
 build/fd2pragma/fd2pragma: projects/fd2pragma/makefile $(shell find 2>/dev/null projects/fd2pragma -not \( -path projects/fd2pragma/.git -prune \) -type f)
 	@mkdir -p build/fd2pragma
-	cd projects/fd2pragma && $(CC) -o $(PWD)/$@ $(CFLAGS) fd2pragma.c
+	cd projects/fd2pragma && $(CC) -o ./$@ $(CFLAGS) fd2pragma.c
 
 projects/fd2pragma/makefile:
 	@mkdir -p projects
@@ -334,7 +337,7 @@ $(PREFIX)/bin/ira: build/ira/ira
 
 build/ira/ira: projects/ira/Makefile $(shell find 2>/dev/null projects/ira -not \( -path projects/ira/.git -prune \) -type f)
 	@mkdir -p build/ira
-	cd projects/ira && $(CC) -o $(PWD)/$@ $(CFLAGS) *.c -std=c99
+	cd projects/ira && $(CC) -o ./$@ $(CFLAGS) *.c -std=c99
 
 projects/ira/Makefile:
 	@mkdir -p projects
@@ -357,8 +360,12 @@ $(PREFIX)/bin/sfdc: build/sfdc/Makefile $(shell find 2>/dev/null projects/sfdc -
 	install build/sfdc/sfdc $(PREFIX)/bin
 
 build/sfdc/Makefile: projects/sfdc/configure
+	for i in $$(find patches/sfdc/ -type f); \
+	do if [[ "$$i" == *.diff ]] ; \
+		then j=$${i:8}; patch -N "projects/$${j%.diff}" "$$i"; fi ; done
+
 	rsync -a projects/sfdc build --exclude .git
-	cd build/sfdc && $(E) $(PWD)/build/sfdc/configure $(CONFIG_SFDC) $(LOG)
+	cd build/sfdc && $(E) ./configure $(CONFIG_SFDC) $(LOG)
 
 projects/sfdc/configure:
 	@mkdir -p projects
@@ -463,12 +470,12 @@ build/ndk-include/_ndk: build/ndk-include/_ndk0 $(NDK_INCLUDE_INLINE) $(NDK_INCL
 
 build/ndk-include/_ndk0: projects/NDK_3.9.info $(NDK_INCLUDE)
 	mkdir -p $(PREFIX)/m68k-amigaos/ndk-include
-	rsync -a $(PWD)/projects/NDK_3.9/Include/include_h/* $(PREFIX)/m68k-amigaos/ndk-include --exclude proto
-	rsync -a $(PWD)/projects/NDK_3.9/Include/include_i/* $(PREFIX)/m68k-amigaos/ndk-include
+	rsync -a ./projects/NDK_3.9/Include/include_h/* $(PREFIX)/m68k-amigaos/ndk-include --exclude proto
+	rsync -a ./projects/NDK_3.9/Include/include_i/* $(PREFIX)/m68k-amigaos/ndk-include
 	mkdir -p $(PREFIX)/m68k-amigaos/ndk/lib
-	rsync -a $(PWD)/projects/NDK_3.9/Include/fd $(PREFIX)/m68k-amigaos/ndk/lib
-	rsync -a $(PWD)/projects/NDK_3.9/Include/sfd $(PREFIX)/m68k-amigaos/ndk/lib
-	rsync -a $(PWD)/projects/NDK_3.9/Include/linker_libs $(PREFIX)/m68k-amigaos/ndk/lib
+	rsync -a ./projects/NDK_3.9/Include/fd $(PREFIX)/m68k-amigaos/ndk/lib
+	rsync -a ./projects/NDK_3.9/Include/sfd $(PREFIX)/m68k-amigaos/ndk/lib
+	rsync -a ./projects/NDK_3.9/Include/linker_libs $(PREFIX)/m68k-amigaos/ndk/lib
 	mkdir -p $(PREFIX)/m68k-amigaos/ndk-include/proto
 	cp -p projects/NDK_3.9/Include/include_h/proto/alib.h $(PREFIX)/m68k-amigaos/ndk-include/proto
 	cp -p projects/NDK_3.9/Include/include_h/proto/cardres.h $(PREFIX)/m68k-amigaos/ndk-include/proto
@@ -557,7 +564,7 @@ build/ndk-include/_ndk13: build/ndk-include/_ndk
 # =================================================
 build/_netinclude: projects/amiga-netinclude/README.md build/ndk-include/_ndk $(shell find 2>/dev/null projects/amiga-netinclude/include -type f)
 	mkdir -p $(PREFIX)/m68k-amigaos/ndk-include
-	rsync -a $(PWD)/projects/amiga-netinclude/include/* $(PREFIX)/m68k-amigaos/ndk-include
+	rsync -a projects/amiga-netinclude/include/* $(PREFIX)/m68k-amigaos/ndk-include
 	echo "done" >$@
 
 projects/amiga-netinclude/README.md: 
@@ -666,7 +673,7 @@ build/libdebug/_done: build/libdebug/Makefile
 
 build/libdebug/Makefile: build/libnix/_done projects/libdebug/configure $(shell find 2>/dev/null projects/libdebug -not \( -path projects/libdebug/.git -prune \) -type f)
 	mkdir -p build/libdebug
-	cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" $(PWD)/projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG)
+	cd build/libdebug && CFLAGS="$(TARGET_C_FLAGS)" ../../projects/libdebug/configure $(CONFIG_LIBDEBUG) $(LOG)
 
 projects/libdebug/configure:
 	@mkdir -p projects
diff --git a/patches/fd2sfd/fd2inline.c.diff b/patches/fd2sfd/fd2inline.c.diff
new file mode 100644
index 0000000..6624e83
--- /dev/null
+++ b/patches/fd2sfd/fd2inline.c.diff
@@ -0,0 +1,14 @@
+--- fd2sfd/fd2inline.c	2018-06-28 14:37:19.772087300 +0100
++++ fd2sfd-patched/fd2inline.c	2018-06-28 09:06:12.977739500 +0100
+@@ -46,6 +46,11 @@
+ #define REGS 16	 /* d0=0,...,a7=15 */
+ #define FDS 1000
+ 
++
++#ifdef __MINGW32__
++#define bcopy(s1, s2, n) memmove((s2), (s1), (n))
++#endif
++
+ typedef enum
+ {
+    d0, d1, d2, d3, d4, d5, d6, d7, a0, a1, a2, a3, a4, a5, a6, a7, illegal
diff --git a/patches/sfdc/sfdc.diff b/patches/sfdc/sfdc.diff
new file mode 100644
index 0000000..e835d22
--- /dev/null
+++ b/patches/sfdc/sfdc.diff
@@ -0,0 +1,12 @@
+--- sfdc/sfdc	2018-06-28 14:37:26.434918400 +0100
++++ sfdc-patched/sfdc	2018-06-28 14:42:58.370540300 +0100
+@@ -484,7 +484,8 @@
+     while (my $line = <SFD>) {
+ 
+       ++$line_no;
+-      
++      $line =~ s/\r//g; 
++
+       for ($line) {
+           /==copyright\s/ && do {
+             ( $$result{'copyright'} = $_ ) =~ s/==copyright\s+(.*)\s*/$1/;