diff --git a/GNUmakefile b/GNUmakefile
index 3210263..3456278 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,15 +1,10 @@
  
-# Check to see if GNUstep-make is available.
-# If GNUSTEP_MAKEFILES is not defined, or gnustep-config does not exist,
-# or gnustep-config cannot provide a value for GNUSTEP_MAKEFILES then we
-# assume it is not, and fall-back to basic make rules.
-ifeq ($(GNUSTEP_MAKEFILES),)
- GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
-endif
+# Check to see if GNUstep-config is available.
+GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
 
 ifeq ($(GNUSTEP_MAKEFILES),)
 #
-# Start of section for building without GNUstep-make
+# Start of section for building without GNUstep
 #
 
 include Makefile
@@ -19,194 +14,44 @@ include Makefile
 #
 else
 #
-# Start of GNUstep-make specific section.
+# Start of GNUstep specific section.
 #
 
 PACKAGE_NAME = gnustep-objc2
-VERSION=4.6.0
 SVN_MODULE_NAME = libobjc2
 SVN_BASE_URL = svn+ssh://svn.gna.org/svn/gnustep/libs
 SVN_TAG_NAME=objc2
 
-include $(GNUSTEP_MAKEFILES)/common.make
-
-LIBOBJC = libobjc
-LIBOBJCLIBNAME = objc
-LIBOBJCXX = libobjcxx
-
-LIBRARY_NAME = ${LIBOBJC}
-
-${LIBOBJC}_OBJC_FILES = \
-	NSBlocks.m\
-	Protocol2.m\
-	arc.m\
-	associate.m\
-	blocks_runtime.m\
-	mutation.m\
-	properties.m
-
-
-${LIBOBJC}_C_FILES = \
-	abi_version.c\
-	alias_table.c\
-	block_to_imp.c\
-	caps.c\
-	category_loader.c\
-	class_table.c\
-	dtable.c\
-	eh_personality.c\
-	encoding2.c\
-	gc_none.c\
-	hash_table.c\
-	hooks.c\
-	ivar.c\
-	loader.c\
-	protocol.c\
-	runtime.c\
-	sarray2.c\
-	selector_table.c\
-	sendmsg2.c\
-	statics_loader.c\
-	toydispatch.c\
-
-
-${LIBOBJCXX}_CC_FILES = objcxx_eh.cc
-${LIBOBJCXX}_LDFLAGS = -L./obj/$(GNUSTEP_TARGET_LDIR)/ -lstdc++ -l${LIBOBJCLIBNAME}
-
-# Object files to include in the build ... GNUstep make uses this to list any
-# files which are not built using the common ObjC/C/ObjC++/C++ language rules.
-${LIBOBJC}_OBJ_FILES = \
-	$(GNUSTEP_OBJ_INSTANCE_DIR)/objc_msgSend.S$(OEXT)\
-	$(GNUSTEP_OBJ_INSTANCE_DIR)/block_trampolines.S$(OEXT)\
-
-# Add rule for producing object files from assembler
-$(GNUSTEP_OBJ_INSTANCE_DIR)/%.S$(OEXT) : %.S
-	$(ECHO_COMPILING)$(CC) -no-integrated-as $< -c \
-	      $(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
-	                                                $(ALL_CFLAGS)) \
-	      $($<_FILE_FLAGS) -o $@$(END_ECHO)
+GNUSTEP_INSTALLATION_DOMAIN ?= LOCAL
 
-
-ifeq ($(disable_legacy), yes)
-${LIBOBJC}_CPPFLAGS += -DNO_LEGACY
-else
-${LIBOBJC}_C_FILES += legacy_malloc.c
-endif
-
-${LIBOBJC}_HEADER_FILES_DIR = objc
-${LIBOBJC}_HEADER_FILES_INSTALL_DIR = objc
-ifneq ($(install_headers), no)
-${LIBOBJC}_HEADER_FILES = \
-	Availability.h\
-	Object.h\
-	Protocol.h\
-	blocks_private.h\
-	blocks_runtime.h\
-	capabilities.h\
-	developer.h\
-	encoding.h\
-	hooks.h\
-	runtime.h\
-	runtime-deprecated.h\
-	slot.h\
-	objc.h\
-	objc-api.h\
-	objc-arc.h\
-	objc-auto.h\
-	toydispatch.h
-endif
-
-# Disable type dependent dispatch if tdd=no is specified
-ifneq ($(tdd), no)
-${LIBOBJC}_CPPFLAGS += -DTYPE_DEPENDENT_DISPATCH
+ifeq ($(messages),yes)
+  SILENT ?= 
 endif
 
-ifeq ($(low_memory), yes)
-${LIBOBJC}_CPPFLAGS += -D__OBJC_LOW_MEMORY__
-endif
+INSTALL := dummy_install
 
-ifeq ($(boehm_gc), yes)
-${LIBOBJC}_C_FILES += gc_boehm.c
-ifneq ($(findstring linux, $(GNUSTEP_TARGET_OS)), linux)
-${LIBOBJC}_LIBRARIES_DEPEND_UPON += -lgc-threaded -lexecinfo
-else
-${LIBOBJC}_LIBRARIES_DEPEND_UPON += -lgc
-endif
-#${LIBOBJC}_OBJCFLAGS += -fobjc-gc
-${LIBOBJC}_CPPFLAGS += -DENABLE_GC
-endif
-
-
-
-ifeq ($(findstring openbsd, $(GNUSTEP_HOST_OS)), openbsd)
-${LIBOBJC}_LIBRARIES_DEPEND_UPON += -pthread 
-else
-${LIBOBJC}_LIBRARIES_DEPEND_UPON += -lpthread 
-endif
-
-# If we're doing a release build, don't tell people that the code that they're
-# using is rubbish - they complain.
-#CPPFLAGS += -DNO_SELECTOR_MISMATCH_WARNINGS
-
-
-# Deprecated functions are only deprecated for external use, not for us because
-# we are special, precious, little flowers.
-${LIBOBJC}_CPPFLAGS +=\
-	-D__OBJC_RUNTIME_INTERNAL__=1\
-	-D_XOPEN_SOURCE=500\
-	-D__BSD_VISIBLE=1\
-	-D_BSD_SOURCE=1\
-
-# Note to Riccardo.  Please do not 'fix' C99isms in this.  The new ABI is only
-# useful on compilers that support C99 (currently only clang), so there is no
-# benefit from supporting platforms with no C99 compiler.
-${LIBOBJC}_CFLAGS += -std=gnu99 -g -fexceptions #-fvisibility=hidden
-${LIBOBJC}_CCFLAGS += -std=c++98 -g -fexceptions #-fvisibility=hidden
-${LIBOBJC}_CFLAGS += -Wno-unused-function
-
-# Uncomment this when debugging - it makes everything slow, but means that the
-# debugger actually works...
-ifeq ($(debug), yes)
-${LIBOBJC}_CFLAGS += -fno-inline
-${LIBOBJC}_OBJCFLAGS += -fno-inline
-${LIBOBJC}_CPPFLAGS += -DGC_DEBUG
-else
-${LIBOBJC}_CFLAGS +=  -O3
-endif
-${LIBOBJC}_OBJCFLAGS += $(${LIBOBJC}_CFLAGS) $(${LIBOBJC}_CFLAGS)
-
-ifneq ($(findstring gcc, $(CC)),)
-  # Hack to get the __sync_* GCC builtins to work with GCC
-  ifeq ($(GNUSTEP_TARGET_CPU), ix86)
-    ${LIBOBJC}_CFLAGS += -march=i586
-  endif
-endif
-
-ifeq ($(GNUSTEP_TARGET_OS), mingw32)
-# Hack to get mingw to provide declaration for strdup (since it is non-standard)
-${LIBOBJC}_CPPFLAGS += -U__STRICT_ANSI__
-endif
-
-include $(GNUSTEP_MAKEFILES)/aggregate.make
-include $(GNUSTEP_MAKEFILES)/library.make
-
-build-opts:
-	@echo Building LLVM optimisation passes...
-	@sh build_opts.sh $(MAKE) all
-
-install-opts: build_opts
-	@echo Installing LLVM optimisation passes...
-	@sh build_opts.sh $(MAKE) install
+include Makefile
 
-clean-opts:
-	@echo Cleaning LLVM optimisation passes...
-	@sh build_opts.sh $(MAKE) clean
+LIB_DIR := $(shell gnustep-config --variable=GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_LIBRARIES 2>/dev/null)
+HEADER_DIR := $(shell gnustep-config --variable=GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_HEADERS 2>/dev/null)
+
+install: all
+	$(SILENT)echo Installing libraries...
+	$(SILENT)install -d $(LIB_DIR)
+	$(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(LIB_DIR)
+	$(SILENT)install -m 444 $(STRIP) $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)
+	$(SILENT)install -m 444 $(STRIP) $(LIBOBJC).a $(LIB_DIR)
+	$(SILENT)echo Creating symbolic links...
+	$(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so
+	$(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION)
+	$(SILENT)ln -sf $(LIBOBJC).so.$(VERSION) $(LIB_DIR)/$(LIBOBJC).so.$(MAJOR_VERSION).$(MINOR_VERSION)
+	$(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so
+	$(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION)
+	$(SILENT)ln -sf $(LIBOBJCXX).so.$(VERSION) $(LIB_DIR)/$(LIBOBJCXX).so.$(MAJOR_VERSION).$(MINOR_VERSION)
+	$(SILENT)echo Installing headers...
+	$(SILENT)install -d $(HEADER_DIR)/objc
+	$(SILENT)install -m 444 objc/*.h $(HEADER_DIR)/objc
 
-after-install::
-	@echo 
-	@echo Please remember to reconfigure gnustep-make if you want it to
-	@echo use the newly installed libobjc2 rather than any prior version.
-	@echo
 #
 # End of GNUstep-make specific section.
 #
diff --git a/Makefile b/Makefile
index bcf3403..8a31666 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,11 @@ LIBOBJCLIBNAME=objc
 LIBOBJC=libobjc
 LIBOBJCXX=libobjcxx
 
+INSTALL ?= install
 SILENT ?= @
 
 CFLAGS += -std=gnu99 -fPIC -fexceptions
-CFLAGS += -Wno-deprecated-objc-isa-usage
+#CFLAGS += -Wno-deprecated-objc-isa-usage
 CXXFLAGS += -fPIC -fexceptions
 CPPFLAGS += -DTYPE_DEPENDENT_DISPATCH -DGNUSTEP
 CPPFLAGS += -D__OBJC_RUNTIME_INTERNAL__=1 -D_XOPEN_SOURCE=500 -D__BSD_VISIBLE=1 -D_BSD_SOURCE=1
@@ -105,7 +106,7 @@ $(LIBOBJC).a: $(OBJECTS)
 	$(SILENT)echo Assembling `basename $<`...
 	$(SILENT)$(CC) $(CPPFLAGS) $(ASMFLAGS) -c $< -o $@
 
-install: all
+$(INSTALL): all
 	$(SILENT)echo Installing libraries...
 	$(SILENT)install -d $(LIB_DIR)
 	$(SILENT)install -m 444 $(STRIP) $(LIBOBJC).so.$(VERSION) $(LIB_DIR)