diff --git a/fhswobundle.make b/fhswobundle.make
new file mode 100644
index 000000000..4afdeef27
--- /dev/null
+++ b/fhswobundle.make
@@ -0,0 +1,35 @@
+# 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