diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index c564f84d649..c4fe2cd23f0 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2005/12/23 16:43:08 mbalmer Exp $
+# $OpenBSD: Makefile,v 1.6 2006/02/04 18:37:36 bernd Exp $
 # $FreeBSD: ports/sysutils/e2fsprogs/Makefile,v 1.8 2003/02/20 19:00:47 knu Exp $
 
 COMMENT=		"utilities to manipulate ext2 filesystems"
 
 DISTNAME=		e2fsprogs-1.27
-PKGNAME=		${DISTNAME}p2
+PKGNAME=		${DISTNAME}p3
 CATEGORIES=		sysutils
 SHARED_LIBS=		e2p		2.3 \
 			ext2fs		2.4 \
@@ -31,6 +31,13 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--enable-elf-shlibs
 USE_GMAKE=		Yes
 
+MAKE_FLAGS=		LIBe2p_VERSION=${LIBe2p_VERSION} \
+			LIBext2fs_VERSION=${LIBext2fs_VERSION} \
+			LIBext2fs_com_err_VERSION=${LIBext2fs_com_err_VERSION} \
+			LIBss_VERSION=${LIBss_VERSION} \
+			LIBuuid_VERSION=${LIBuuid_VERSION}
+FAKE_FLAGS=		${MAKE_FLAGS}
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/include/ext2fs
 	${INSTALL_DATA_DIR} ${PREFIX}/include/uuid
diff --git a/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in b/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
new file mode 100644
index 00000000000..2fc738c338b
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_e2p_Makefile_in,v 1.1 2006/02/04 18:37:36 bernd Exp $
+--- lib/e2p/Makefile.in.orig	Sat Feb  4 19:03:34 2006
++++ lib/e2p/Makefile.in	Sat Feb  4 19:04:11 2006
+@@ -42,7 +42,7 @@ DLL_STUB = libe2p
+ DLL_MYDIR = e2p
+ DLL_INSTALL_DIR = $(root_libdir)
+ 
+-ELF_VERSION = 2.3
++ELF_VERSION = $(LIBe2p_VERSION)
+ ELF_SO_VERSION = 2
+ ELF_IMAGE = libe2p
+ ELF_MYDIR = e2p
diff --git a/sysutils/e2fsprogs/patches/patch-lib_et_Makefile_in b/sysutils/e2fsprogs/patches/patch-lib_et_Makefile_in
index e140b688674..5dc66197e2f 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_et_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-lib_et_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_et_Makefile_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
---- lib/et/Makefile.in.orig	2003-11-17 00:50:20.000000000 +0100
-+++ lib/et/Makefile.in	2003-11-17 00:53:01.000000000 +0100
+$OpenBSD: patch-lib_et_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
+--- lib/et/Makefile.in.orig	Sun Feb 24 21:03:59 2002
++++ lib/et/Makefile.in	Sat Feb  4 19:05:39 2006
 @@ -22,7 +22,7 @@ SRCS = $(srcdir)/error_message.c $(srcdi
  HFILES= com_err.h
  SHARE_FILES= et_c.awk et_h.awk
@@ -19,7 +19,8 @@ $OpenBSD: patch-lib_et_Makefile_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
  DLL_MYDIR = et
  DLL_INSTALL_DIR = $(root_libdir)
  
- ELF_VERSION = 2.0
+-ELF_VERSION = 2.0
++ELF_VERSION = $(LIBext2fs_com_err_VERSION)
  ELF_SO_VERSION = 2
 -ELF_IMAGE = libcom_err
 +ELF_IMAGE = libext2fs_com_err
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in
index 6ed79f3c32e..31916465c43 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in
@@ -1,7 +1,13 @@
-$OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
---- lib/ext2fs/Makefile.in.orig	2003-11-17 01:02:03.000000000 +0100
-+++ lib/ext2fs/Makefile.in	2003-11-17 01:02:13.000000000 +0100
-@@ -144,7 +144,7 @@ ELF_SO_VERSION = 2
+$OpenBSD: patch-lib_ext2fs_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
+--- lib/ext2fs/Makefile.in.orig	Fri Mar  8 06:05:02 2002
++++ lib/ext2fs/Makefile.in	Sat Feb  4 19:04:53 2006
+@@ -139,12 +139,12 @@ DLL_LIBS = -L../.. -lcom_err
+ DLL_MYDIR = ext2fs
+ DLL_INSTALL_DIR = $(root_libdir)
+ 
+-ELF_VERSION = 2.4
++ELF_VERSION = $(LIBext2fs_VERSION)
+ ELF_SO_VERSION = 2
  ELF_IMAGE = libext2fs
  ELF_MYDIR = ext2fs
  ELF_INSTALL_DIR = $(root_libdir)
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ss_Makefile_in b/sysutils/e2fsprogs/patches/patch-lib_ss_Makefile_in
index 2482ac9332b..7fc6120ddec 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_ss_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-lib_ss_Makefile_in
@@ -1,7 +1,13 @@
-$OpenBSD: patch-lib_ss_Makefile_in,v 1.1.1.1 2004/02/20 19:54:58 espie Exp $
---- lib/ss/Makefile.in.orig	2003-11-17 01:05:46.000000000 +0100
-+++ lib/ss/Makefile.in	2003-11-17 01:05:55.000000000 +0100
-@@ -29,7 +29,7 @@ ELF_SO_VERSION = 2
+$OpenBSD: patch-lib_ss_Makefile_in,v 1.2 2006/02/04 18:37:36 bernd Exp $
+--- lib/ss/Makefile.in.orig	Sun Feb 24 21:04:00 2002
++++ lib/ss/Makefile.in	Sat Feb  4 19:06:07 2006
+@@ -24,12 +24,12 @@ DLL_LIBS = -L../.. -lcom_err
+ DLL_MYDIR = ss
+ DLL_INSTALL_DIR = $(root_libdir)
+ 
+-ELF_VERSION = 2.0
++ELF_VERSION = $(LIBss_VERSION)
+ ELF_SO_VERSION = 2
  ELF_IMAGE = libss
  ELF_MYDIR = ss
  ELF_INSTALL_DIR = $(root_libdir)
diff --git a/sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in b/sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in
new file mode 100644
index 00000000000..3aa74de0504
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-lib_uuid_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_uuid_Makefile_in,v 1.1 2006/02/04 18:37:36 bernd Exp $
+--- lib/uuid/Makefile.in.orig	Sat Feb  4 19:06:20 2006
++++ lib/uuid/Makefile.in	Sat Feb  4 19:06:38 2006
+@@ -54,7 +54,7 @@ DLL_STUB = libuuid
+ DLL_MYDIR = uuid
+ DLL_INSTALL_DIR = $(root_libdir)
+ 
+-ELF_VERSION = 1.2
++ELF_VERSION = $(LIBuuid_VERSION)
+ ELF_SO_VERSION = 1
+ ELF_IMAGE = libuuid
+ ELF_MYDIR = uuid