diff --git a/fhslib.make b/fhslib.make
deleted file mode 100644
index 42a60a34e..000000000
--- a/fhslib.make
+++ /dev/null
@@ -1,61 +0,0 @@
-# postprocessing
-
-# FHS support (this is a hack and is going to be done by gstep-make!)
-
-ifneq ($(FHS_INSTALL_ROOT),)
-
-FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-
-NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
-NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
-NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
-
-# headers
-
-ifneq ($(FHS_HEADER_DIRS),)
-
-move-headers-to-fhs ::
-	@echo "moving headers to $(FHS_INCLUDE_DIR) .."
-	for i in "$(FHS_HEADER_DIRS)"; do \
-	  $(MKDIRS) $(FHS_INCLUDE_DIR)/$$i;	\
-          mv $(GNUSTEP_HEADERS)/$$i/*.h $(FHS_INCLUDE_DIR)/$$i/; \
-	done
-
-else
-
-move-headers-to-fhs :: 
-
-endif
-
-move-libs-to-fhs :: 
-	@echo "moving libs to $(FHS_LIB_DIR) .."
-	mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
-
-# tools
-
-ifneq ($(TOOL_NAME),)
-
-fhs-bin-dirs ::
-	$(MKDIRS) $(FHS_BIN_DIR)
-
-move-tools-to-fhs :: fhs-bin-dirs
-	@echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .."
-	for i in $(TOOL_NAME); do \
-	  mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
-	done
-
-else
-
-move-tools-to-fhs ::
-
-endif
-
-# master
-
-move-to-fhs :: move-headers-to-fhs move-libs-to-fhs move-tools-to-fhs
-
-after-install :: move-to-fhs
-
-endif
diff --git a/fhstool.make b/fhstool.make
deleted file mode 100644
index 27c85d132..000000000
--- a/fhstool.make
+++ /dev/null
@@ -1,26 +0,0 @@
-# postprocessing
-
-# FHS support (this is a hack and is going to be done by gstep-make!)
-
-ifneq ($(FHS_INSTALL_ROOT),)
-
-FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
-
-fhs-bin-dirs ::
-	$(MKDIRS) $(FHS_BIN_DIR)
-
-NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
-
-move-tools-to-fhs :: fhs-bin-dirs
-	@echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .."
-	for i in $(TOOL_NAME); do \
-	  mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
-	done
-
-move-to-fhs :: move-tools-to-fhs
-
-after-install :: move-to-fhs
-
-endif
diff --git a/fhswobundle.make b/fhswobundle.make
deleted file mode 100644
index 4afdeef27..000000000
--- a/fhswobundle.make
+++ /dev/null
@@ -1,35 +0,0 @@
-# FHS support (this is a hack and is going to be done by gstep-make!)
-
-ifneq ($(FHS_INSTALL_ROOT),)
-
-FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
-FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
-FHS_SOGOD_DIR=$(FHS_LIB_DIR)sogod-$(MAJOR_VERSION).$(MINOR_VERSION)/
-
-#NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
-#NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
-NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
-
-
-fhs-sogod-dirs ::
-	$(MKDIRS) $(FHS_SOGOD_DIR)
-
-move-wobundles-to-fhs :: fhs-sogod-dirs
-	@echo "moving wobundles $(WOBUNDLE_INSTALL_DIR) to $(FHS_SOGOD_DIR) .."
-	for i in $(WOBUNDLE_NAME); do \
-          j="$(FHS_SOGOD_DIR)/$${i}$(WOBUNDLE_EXTENSION)"; \
-	  if test -d $$j; then rm -r $$j; fi; \
-	  (cd $(WOBUNDLE_INSTALL_DIR); \
-	    $(TAR) chf - --exclude=CVS --exclude=.svn --to-stdout \
-            "$${i}$(WOBUNDLE_EXTENSION)") | \
-          (cd $(FHS_SOGOD_DIR); $(TAR) xf -); \
-	  rm -rf "$(WOBUNDLE_INSTALL_DIR)/$${i}$(WOBUNDLE_EXTENSION)";\
-	done
-
-#	  mv "$(WOBUNDLE_INSTALL_DIR)/$${i}$(WOBUNDLE_EXTENSION)" $$j; \
-
-move-to-fhs :: move-wobundles-to-fhs
-
-after-install :: move-to-fhs
-
-endif