diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index b8e68c23bf7..c543c3dcbfb 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 1999/03/31 08:00:24 marc Exp $
+# $OpenBSD: Makefile,v 1.17 1999/04/08 04:21:52 brad Exp $
 
 DISTNAME=	gimp-1.1.4
 CATEGORIES=	graphics
@@ -29,6 +29,24 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		GTK_CONFIG="${X11BASE}/bin/gtk-config"
 
+# People that installed an older version of gimp 1.1.x wound up with
+# shared libs with a major/minor of 1.3 or 1.4 ... these files
+# MUST be removed as the version was incorrect (it came from 1.1.x
+# sources). Check that out here (and bitch if necessary).
+pre-extract:
+	@if [ -f ${X11BASE}/lib/libgimp.so.1.3 -o -f ${X11BASE}/lib/libgimp.so.1.4 ]; then \
+	   echo "+-------------------"; \
+	   echo "| ERROR: you MUST remove the existing gimp installation"; \
+	   echo "| before installing this version. To fully remove run"; \
+	   echo "| these commands as user root"; \
+	   echo "|"; \
+	   echo "|      pkg_delete -f `pkg_info -e 'gimp-*'`"; \
+	   echo "|      ldconfig ${X11BASE}/lib"; \
+	   echo "|"; \
+	   echo "+-------------------"; \
+	   exit 1; \
+	fi
+
 post-install:
 	@${MKDIR} ${LOCALBASE}/share/aclocal
 	@${INSTALL_DATA} ${WRKSRC}/gimp.m4 ${LOCALBASE}/share/aclocal/
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index 53f8e873695..78aa7edacd5 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -5,12 +5,12 @@
  
  
 -libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimp_la_LDFLAGS =  	-version-info 1:4:0
++libgimp_la_LDFLAGS =  	-version-info 1:1:0
  
  libgimp_la_LIBADD = $(GLIB_LIBS) -lm
  
 -libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS =  	-version-info 1:4:0
++libgimpui_la_LDFLAGS =  	-version-info 1:1:0
  
  libgimpui_la_LIBADD = $(GTK_LIBS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 1580d025d7f..945bbc637c0 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -5,7 +5,7 @@
  
  
 -libgck_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-+libgck_la_LDFLAGS =  	-version-info 1:4:0
++libgck_la_LDFLAGS =  	-version-info 1:1:0
  
  
  INCLUDES =  	-I..				-I$(srcdir)/..			-I$(top_srcdir)			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae
new file mode 100644
index 00000000000..3e3311e400d
--- /dev/null
+++ b/graphics/gimp/patches/patch-ae
@@ -0,0 +1,11 @@
+--- libgimp/Makefile.in.orig	Wed Apr  7 19:40:16 1999
++++ libgimp/Makefile.in	Wed Apr  7 19:41:39 1999
+@@ -163,7 +163,7 @@
+ 
+ gimpincludedir = $(includedir)/libgimp
+ 
+-CPPFLAGS =  	-DGIMPDIR=\""$(gimpdir)"\"		-DDATADIR=\""$(gimpdatadir)"\"		@GIMP_THREAD_FLAGS@
++CPPFLAGS =  	-DGIMPDIR=\""$(gimpdir)"\"		-DDATADIR=\""$(gimpdatadir)"\"		@GIMP_THREAD_FLAGS@	@CPPFLAGS@
+ 
+ 
+ INCLUDES =  	-I$(top_srcdir)			-I$(top_srcdir)/intl		-I../intl			$(GTK_CFLAGS)			-I$(includedir)
diff --git a/graphics/gimp/patches/patch-af b/graphics/gimp/patches/patch-af
new file mode 100644
index 00000000000..3e2908d4c34
--- /dev/null
+++ b/graphics/gimp/patches/patch-af
@@ -0,0 +1,11 @@
+--- app/Makefile.in.orig	Wed Apr  7 20:53:10 1999
++++ app/Makefile.in	Wed Apr  7 20:53:31 1999
+@@ -175,7 +175,7 @@
+ EXTRA_DIST =  	makefile.msc			gimp.def			gimp.rc				wilber.ico
+ 
+ 
+-CPPFLAGS =  	-DLIBDIR=\""$(gimpplugindir)"\"		-DLOCALEDIR=\""$(localedir)"\"		-DREGEX_MALLOC				@GIMP_THREAD_FLAGS@
++CPPFLAGS =  	-DLIBDIR=\""$(gimpplugindir)"\"		-DLOCALEDIR=\""$(localedir)"\"		-DREGEX_MALLOC		@GIMP_THREAD_FLAGS@	@CPPFLAGS@
+ 
+ 
+ INCLUDES =  	-I$(top_srcdir)				-I$(top_srcdir)/intl			$(GTK_CFLAGS)				-I$(includedir)
diff --git a/graphics/gimp/pkg/PLIST b/graphics/gimp/pkg/PLIST
index 66f12d2a607..7a244e7538b 100644
--- a/graphics/gimp/pkg/PLIST
+++ b/graphics/gimp/pkg/PLIST
@@ -174,13 +174,13 @@ lib/gimp/1.1/modules/libcolorsel_gtk.la
 lib/gimp/1.1/modules/libcolorsel_gtk.a
 lib/gimp/1.1/modules/libcolorsel_triangle.la
 lib/gimp/1.1/modules/libcolorsel_triangle.a
-lib/libgimp.so.1.4
+lib/libgimp.so.1.1
 lib/libgimp.la
 lib/libgimp.a
-lib/libgimpui.so.1.4
+lib/libgimpui.so.1.1
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.1.4
+lib/libgck.so.1.1
 lib/libgck.la
 lib/libgck.a
 lib/libmegawidget.a