diff --git a/lang/gnustep-libobjc/Makefile b/lang/gnustep-libobjc/Makefile
index b582ae74f84c..1f125c7d6faf 100644
--- a/lang/gnustep-libobjc/Makefile
+++ b/lang/gnustep-libobjc/Makefile
@@ -1,30 +1,33 @@
 # New ports collection makefile for:    libobjc2
 # Date created:         06 Octil 2010
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libobjc2
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	lang devel gnustep
 MASTER_SITES=	http://download.gna.org/gnustep/
 PKGNAMEPREFIX=	gnustep-
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNUstep Objective-C runtime for GCC and LLVM
 
 LICENSE=	MIT
 
 USE_BZIP2=	yes
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 GNUSTEP_WITHOUT_LIBOBJC=	yes
 USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKE_ENV+=	GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-DEFAULT_LIBVERSION=	4
+DEFAULT_LIBVERSION=	5
+
+post-patch:
+	${REINPLACE_CMD} -e 's|libobjc_VERSION = 4|libobjc_VERSION = ${DEFAULT_LIBVERSION}|' \
+		${WRKSRC}/GNUmakefile
 
 .include <bsd.port.mk>
diff --git a/lang/gnustep-libobjc/distinfo b/lang/gnustep-libobjc/distinfo
index 3204f9a8a393..0ce4c06b0980 100644
--- a/lang/gnustep-libobjc/distinfo
+++ b/lang/gnustep-libobjc/distinfo
@@ -1,3 +1,2 @@
-MD5 (libobjc2-1.0.tar.bz2) = 0d6c683f765c43721f3d6f83d7df4921
-SHA256 (libobjc2-1.0.tar.bz2) = 8903157a6fe6b82b4571a33855f98e0da0fe92a94f69a9a5edd1af94310f0566
-SIZE (libobjc2-1.0.tar.bz2) = 66560
+SHA256 (libobjc2-1.1.tar.bz2) = c97e446cbe848285a6528f85acc7447da342f6e56d2a5b5de23b9603c003b289
+SIZE (libobjc2-1.1.tar.bz2) = 88009
diff --git a/lang/gnustep-libobjc/pkg-plist b/lang/gnustep-libobjc/pkg-plist
index 90c6c01b286b..94464aeb680a 100644
--- a/lang/gnustep-libobjc/pkg-plist
+++ b/lang/gnustep-libobjc/pkg-plist
@@ -1,18 +1,22 @@
 GNUstep/System/Library/Headers/objc/Availability.h
 GNUstep/System/Library/Headers/objc/Object.h
 GNUstep/System/Library/Headers/objc/Protocol.h
 GNUstep/System/Library/Headers/objc/blocks_runtime.h
 GNUstep/System/Library/Headers/objc/capabilities.h
 GNUstep/System/Library/Headers/objc/encoding.h
 GNUstep/System/Library/Headers/objc/hooks.h
 GNUstep/System/Library/Headers/objc/objc-api.h
 GNUstep/System/Library/Headers/objc/objc.h
 GNUstep/System/Library/Headers/objc/runtime.h
 GNUstep/System/Library/Headers/objc/slot.h
-GNUstep/System/Library/Headers/toydispatch/toydispatch.h
+GNUstep/System/Library/Headers/objc/toydispatch.h
 GNUstep/System/Library/Libraries/libobjc.so
 GNUstep/System/Library/Libraries/libobjc.so.%%MAJORLIBVERSION%%
-GNUstep/System/Library/Libraries/libtoydispatch.so
-GNUstep/System/Library/Libraries/libtoydispatch.so.%%MAJORVERSION%%
 @dirrm GNUstep/System/Library/Headers/toydispatch
 @dirrm GNUstep/System/Library/Headers/objc
+@exec mv -i /usr/include/objc /usr/include/objc1
+@exec mkdir /usr/lib/compat/libobjc
+@exec mv -i /usr/lib/libobjc.* /usr/lib/compat/libobjc/
+@unexec mv -i /usr/include/objc1 /usr/include/objc
+@unexec mv -i /usr/lib/compat/libobjc/libobjc.* /usr/lib/
+@unexec rmdir /usr/lib/compat/libobjc