diff --git a/devel/libconfig/Makefile b/devel/libconfig/Makefile
index 6f06cc47eb2..0acbcf23b95 100644
--- a/devel/libconfig/Makefile
+++ b/devel/libconfig/Makefile
@@ -1,18 +1,16 @@
-# $OpenBSD: Makefile,v 1.6 2009/05/30 21:58:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2010/12/15 09:31:46 jasper Exp $
 
 COMMENT=		library for manipulating structured configuration files
 
-DISTNAME=		libconfig-1.3.2
+DISTNAME=		libconfig-1.4.6
 
-SHARED_LIBS=		config		8.0 \
-			config++	8.0
+SHARED_LIBS=		config		9.0 \
+			config++	9.0
 
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.hyperrealm.com/libconfig/libconfig.html
 
-MAINTAINER=		Markus Bergkvist <markus.bergkvist@telia.com>
-
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -24,11 +22,15 @@ MASTER_SITES=		http://www.hyperrealm.com/libconfig/
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 
+WANTLIB += c m stdc++
+
+REGRESS_TARGET = test
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libconfig
-	${INSTALL_DATA} ${WRKSRC}/samples/c/*.c \
+	${INSTALL_DATA} ${WRKSRC}/examples/c/*.c \
 		${PREFIX}/share/examples/libconfig
-	${INSTALL_DATA} ${WRKSRC}/samples/c++/*.cpp \
+	${INSTALL_DATA} ${WRKSRC}/examples/c++/*.cpp \
 		${PREFIX}/share/examples/libconfig
 
 .include <bsd.port.mk>
diff --git a/devel/libconfig/distinfo b/devel/libconfig/distinfo
index 69b1262166c..9fbea4993d9 100644
--- a/devel/libconfig/distinfo
+++ b/devel/libconfig/distinfo
@@ -1,5 +1,5 @@
-MD5 (libconfig-1.3.2.tar.gz) = CUqCr9OCqiMFxsw8BgJcLQ==
-RMD160 (libconfig-1.3.2.tar.gz) = s9LoiY7uZRMR1fyBVNS9kF5Qyok=
-SHA1 (libconfig-1.3.2.tar.gz) = Dc4M1fwQPEgB/uovaKnFfcsW1tw=
-SHA256 (libconfig-1.3.2.tar.gz) = KmgLsz4pDDx5njqQzywPufVILdkwrZPZ+DzjmSMljAo=
-SIZE (libconfig-1.3.2.tar.gz) = 531217
+MD5 (libconfig-1.4.6.tar.gz) = +D0gWIlB6bMG+8u26WMKrA==
+RMD160 (libconfig-1.4.6.tar.gz) = rdv8oKfGWooYmRtnPr4tq1kVPDU=
+SHA1 (libconfig-1.4.6.tar.gz) = /ICTxgk5AuIKEfYxtHG8pm+DnH0=
+SHA256 (libconfig-1.4.6.tar.gz) = fRL2+vqrmSPzlUAWVx/FaXVHcTxj4HOCIlf4EsOwo6k=
+SIZE (libconfig-1.4.6.tar.gz) = 644180
diff --git a/devel/libconfig/patches/patch-tests_Makefile_in b/devel/libconfig/patches/patch-tests_Makefile_in
new file mode 100644
index 00000000000..d9699f0b57c
--- /dev/null
+++ b/devel/libconfig/patches/patch-tests_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-tests_Makefile_in,v 1.1 2010/12/15 09:31:46 jasper Exp $
+--- tests/Makefile.in.orig	Mon Sep 27 04:24:45 2010
++++ tests/Makefile.in	Wed Dec 15 01:15:09 2010
+@@ -481,7 +481,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-binPROGRAMS
++install-exec-am:
+ 
+ install-html: install-html-am
+ 
diff --git a/devel/libconfig/pkg/PLIST b/devel/libconfig/pkg/PLIST
index 2626a369ef1..238f36cf544 100644
--- a/devel/libconfig/pkg/PLIST
+++ b/devel/libconfig/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2008/09/16 16:52:15 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/12/15 09:31:46 jasper Exp $
 %%SHARED%%
 include/libconfig.h
 include/libconfig.h++
@@ -11,11 +11,10 @@ lib/pkgconfig/
 lib/pkgconfig/libconfig++.pc
 lib/pkgconfig/libconfig.pc
 share/examples/libconfig/
-share/examples/libconfig/sample1.c
-share/examples/libconfig/sample1.cpp
-share/examples/libconfig/sample2.c
-share/examples/libconfig/sample2.cpp
-share/examples/libconfig/sample3.c
-share/examples/libconfig/sample3.cpp
-share/examples/libconfig/stub.c
-share/examples/libconfig/stubcpp.cpp
+share/examples/libconfig/example1.c
+share/examples/libconfig/example1.cpp
+share/examples/libconfig/example2.c
+share/examples/libconfig/example2.cpp
+share/examples/libconfig/example3.c
+share/examples/libconfig/example3.cpp
+share/examples/libconfig/example4.cpp