diff --git a/README.md b/README.md
index 509ab4f..24855c6 100644
--- a/README.md
+++ b/README.md
@@ -32,6 +32,7 @@ There are no downloads provided for the time being. I do as much as possible to
  * Ubuntu 12.04 LTS 64-bit (gcc 4.6.3) *Requires gcc-multilib package!*
  * MacOS X 10.7.5 (MacPorts - gcc 4.7.3)
  * MacOS X 10.8.4 (Homebrew - gcc 4.2.1 from XCode) *Thanks go to Argasek!*
+ * MaxOS X 10.9.1 (MacPorts - gcc 4.8.2)
  
 ### Documentation
 
@@ -62,7 +63,6 @@ You have to have following packages installed in your system:
  * GNU flex 2.5.x
  * GNU gcc 4.x
  * GNU make 3.x
- * GNU texinfo 4.x
  * lha
  * perl 5.10
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 616df09..3c9a7d8 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -107,6 +107,10 @@ function unpack_sources {
   fi
 
   unpack_clean "${FD2SFD}" "${FD2SFD_SRC}"
+  pushd "${FD2SFD}"
+  apply_patches "${FD2SFD}"
+  popd
+
   unpack_clean "${SFDC}" "${SFDC_SRC}"
   pushd "${SFDC}"
   apply_patches "${SFDC}"
@@ -394,18 +398,18 @@ function process_ndk {
   [ -f "${STAMP}/process-ndk" ] && return 0
 
   pushd "${BUILD_DIR}"
-	rm -rf "${SFDC}"
-	cp -a "${SOURCES}/${SFDC}" "${SFDC}"
-  cd "${SFDC}"
+  rm -rf "${FD2SFD}"
+  cp -a "${SOURCES}/${FD2SFD}" "${FD2SFD}"
+  cd "${FD2SFD}"
   ./configure \
     --prefix="${PREFIX}"
   make && make install
   popd
 
   pushd "${BUILD_DIR}"
-  rm -rf "${FD2SFD}"
-  cp -a "${SOURCES}/${FD2SFD}" "${FD2SFD}"
-  cd "${FD2SFD}"
+	rm -rf "${SFDC}"
+	cp -a "${SOURCES}/${SFDC}" "${SFDC}"
+  cd "${SFDC}"
   ./configure \
     --prefix="${PREFIX}"
   make && make install
diff --git a/patches/fd2sfd-1.0/Makefile.in.diff b/patches/fd2sfd-1.0/Makefile.in.diff
new file mode 100644
index 0000000..e9b2b54
--- /dev/null
+++ b/patches/fd2sfd-1.0/Makefile.in.diff
@@ -0,0 +1,48 @@
+--- fd2sfd-1.0/Makefile.in.orig	2014-01-02 21:21:41.000000000 +0100
++++ fd2sfd-1.0/Makefile.in	2014-01-02 21:23:12.000000000 +0100
+@@ -45,45 +45,6 @@
+ 	  $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
+ 	done
+ 
+-	# Install example file structure for FDs
+-	$(INSTALL) -d $(prefix)/os-lib/fd/3rd
+-	$(INSTALL) -d $(prefix)/os-lib/fd/3rd-amigaos
+-	$(INSTALL) -d $(prefix)/os-lib/fd/3rd-amithlon
+-	$(INSTALL) -d $(prefix)/os-lib/fd/3rd-morphos
+-	$(INSTALL) -d $(prefix)/os-lib/fd/amigaos
+-	$(INSTALL) -d $(prefix)/os-lib/fd/morphos
+-	$(INSTALL_DATA) $(srcdir)/README.os-lib.fd $(prefix)/os-lib/fd/README
+-
+-	# Install example file structure for SFDs
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/3rd
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/3rd-amigaos
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/3rd-amithlon
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/3rd-morphos
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/amigaos
+-	$(INSTALL) -d $(prefix)/os-lib/sfd/morphos
+-	$(INSTALL_DATA) $(srcdir)/README.os-lib.sfd $(prefix)/os-lib/sfd/README
+-
+-	# Install example file structure for includes
+-	$(INSTALL) -d $(prefix)/os-include/3rd
+-	$(INSTALL) -d $(prefix)/os-include/3rd-amigaos
+-	$(INSTALL) -d $(prefix)/os-include/3rd-amithlon
+-	$(INSTALL) -d $(prefix)/os-include/3rd-morphos
+-	for dir in classes clib datatypes devices diskfont dos exec \
+-		   gadgets graphics hardware images intuition libraries \
+-		   prefs reaction resources rexx \
+-		   utility workbench; do \
+-	  $(INSTALL) -d $(prefix)/os-include/amigaos/$${dir}; \
+-	done
+-
+-	for dir in classes clib cybergraphx datatypes devices diskfont dos \
+-		   emul exec gadgets graphics guigfx hardware images \
+-		   intuition libraries mui net ppcdisslib ppclib \
+-		   prefs reaction render resources rexx \
+-		   utility workbench; do \
+-	  $(INSTALL) -d $(prefix)/os-include/morphos/$${dir}; \
+-	done
+-	$(INSTALL_DATA) $(srcdir)/README.os-include $(prefix)/os-include/README
+-
+ tgz:		all gg-fd2sfd.spec
+ 	cd $(srcdir) && cvs diff >/dev/null || (echo "Not checked in!"; exit 10)
+ 	mkdir $(EXECUTABLE)-$(VERSION)