diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 6ffb67c9bd4a..aecd9d71ae2e 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -1,103 +1,103 @@
 # New ports collection makefile for:   gtk13
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.18.5
+PORTVERSION=	2.18.6
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.10:${PORTSDIR}/graphics/jpeg \
 		jasper.4:${PORTSDIR}/graphics/jasper
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes --with-libjasper
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GTK_VERSION=	2.10.0
 PLIST_SUB=	GTK_VERSION="${GTK_VERSION}"
 
 gdk_pixbuf_MAN=	gdk-pixbuf-query-loaders.1
 gtk_MAN=	gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
 
 MAN1=		${gdk_pixbuf_MAN} ${gtk_MAN}
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
 	!defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
 PLIST_SUB+=	CUPS:=""
 .else
 CONFIGURE_ARGS+=--disable-cups
 PLIST_SUB+=	CUPS:="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
 # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
 	@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
 		s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
 		${WRKSRC}/demos/gtk-demo/Makefile.in
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
 
 pre-build:
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
 		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
 	${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
 		${PREFIX}/man/man1
 	${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
 		${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/x11-toolkits/gtk20/distinfo b/x11-toolkits/gtk20/distinfo
index 89e3c1c38fec..a262f0562c67 100644
--- a/x11-toolkits/gtk20/distinfo
+++ b/x11-toolkits/gtk20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.5.tar.bz2) = 3047875309f7f6030e03b0a95cf99c8c
-SHA256 (gnome2/gtk+-2.18.5.tar.bz2) = 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
-SIZE (gnome2/gtk+-2.18.5.tar.bz2) = 18126480
+MD5 (gnome2/gtk+-2.18.6.tar.bz2) = 3b32073cf1fad755f7c2b2db71aebe90
+SHA256 (gnome2/gtk+-2.18.6.tar.bz2) = 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
+SIZE (gnome2/gtk+-2.18.6.tar.bz2) = 18137401
diff --git a/x11-toolkits/gtk20/files/patch-ah b/x11-toolkits/gtk20/files/patch-ah
index 416fbb3f007e..4d2c63f0d2e2 100644
--- a/x11-toolkits/gtk20/files/patch-ah
+++ b/x11-toolkits/gtk20/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-09-05 11:12:17.000000000 +0200
-+++ docs/Makefile.in	2009-09-05 11:16:52.000000000 +0200
-@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig	2010-01-18 01:13:15.000000000 -0500
++++ docs/Makefile.in	2010-01-18 01:14:29.000000000 -0500
+@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
diff --git a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
index 8037cf952ad2..348bb57b8fdb 100644
--- a/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk20/files/patch-gtk_Makefile.in
@@ -1,14 +1,17 @@
---- gtk/Makefile.in.orig	2009-09-05 11:21:40.000000000 +0200
-+++ gtk/Makefile.in	2009-09-05 11:22:57.000000000 +0200
-@@ -1310,9 +1310,9 @@ LDADDS = \
- 
- bin_SCRIPTS = gtk-builder-convert
+--- gtk/Makefile.in.orig	2010-01-18 01:17:13.000000000 -0500
++++ gtk/Makefile.in	2010-01-18 01:18:40.000000000 -0500
+@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+ # gtk-update-icon-cache.exe doesn't require any special privileges.
+ @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ gtk_update_icon_cache_LDADD = \
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+-	$(GDK_PIXBUF_DEP_LIBS)
++	$(GDK_PIXBUF_DEP_LIBS) \
++	$(GLIB_LIBS)
+ 
  gtk_update_icon_cache_SOURCES = \
  	updateiconcache.c 
- 
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 6ffb67c9bd4a..aecd9d71ae2e 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,103 +1,103 @@
 # New ports collection makefile for:   gtk13
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.174 2009/10/17 09:40:33 kwm Exp $
 #
 
 PORTNAME=	gtk
-PORTVERSION=	2.18.5
+PORTVERSION=	2.18.6
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
 		ftp://ftp.mirror.ac.uk/sites/ftp.gimp.org/pub/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gtk+-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (current stable version)
 
 USE_BZIP2=	yes
 LATEST_LINK=	gtk20
 
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.10:${PORTSDIR}/graphics/jpeg \
 		jasper.4:${PORTSDIR}/graphics/jasper
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
 USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \
 		xcomposite
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes --with-libjasper
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GTK_VERSION=	2.10.0
 PLIST_SUB=	GTK_VERSION="${GTK_VERSION}"
 
 gdk_pixbuf_MAN=	gdk-pixbuf-query-loaders.1
 gtk_MAN=	gtk-query-immodules-2.0.1 gtk-update-icon-cache.1
 
 MAN1=		${gdk_pixbuf_MAN} ${gtk_MAN}
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug=yes
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \
 	!defined(WITHOUT_CUPS)
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
 PLIST_SUB+=	CUPS:=""
 .else
 CONFIGURE_ARGS+=--disable-cups
 PLIST_SUB+=	CUPS:="@comment "
 .endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${GREP} -l lgmodule | \
 		${XARGS} ${REINPLACE_CMD} -e 's|-lgmodule|@GMODULE_LIBS@|g'
 	@${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \
 		${WRKSRC}/configure
 # GnomeVFS needs pthread; gtk-demo may use GnomeVFS (via GtkFileChooser)
 	@${REINPLACE_CMD} -e 's|@CFLAGS@|& ${PTHREAD_CFLAGS}|; \
 		s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
 		${WRKSRC}/demos/gtk-demo/Makefile.in
 	@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
 	@${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
 		${WRKSRC}/gtk/Makefile.in
 
 pre-build:
 	@${RM} -rf ${WRKSRC}/docs/gtk.info*
 
 post-install:
 	-@${FIND} ${LOCALBASE}/share/icons -type d -depth 1 -exec \
 		${PREFIX}/bin/gtk-update-icon-cache -q -f {} \; 2>/dev/null
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/modules
 	@${MKDIR} ${PREFIX}/lib/gtk-2.0/${GTK_VERSION}/engines
 	${INSTALL_MAN} ${gdk_pixbuf_MAN:S|^|${WRKSRC}/docs/reference/gdk-pixbuf/|} \
 		${PREFIX}/man/man1
 	${INSTALL_MAN} ${gtk_MAN:S|^|${WRKSRC}/docs/reference/gtk/|} \
 		${PREFIX}/man/man1
 
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 89e3c1c38fec..a262f0562c67 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gtk+-2.18.5.tar.bz2) = 3047875309f7f6030e03b0a95cf99c8c
-SHA256 (gnome2/gtk+-2.18.5.tar.bz2) = 4986365bce2f164edae10be20a4d417eadca9534eedfd9e2176a0c45334b7bf4
-SIZE (gnome2/gtk+-2.18.5.tar.bz2) = 18126480
+MD5 (gnome2/gtk+-2.18.6.tar.bz2) = 3b32073cf1fad755f7c2b2db71aebe90
+SHA256 (gnome2/gtk+-2.18.6.tar.bz2) = 5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
+SIZE (gnome2/gtk+-2.18.6.tar.bz2) = 18137401
diff --git a/x11-toolkits/gtk30/files/patch-ah b/x11-toolkits/gtk30/files/patch-ah
index 416fbb3f007e..4d2c63f0d2e2 100644
--- a/x11-toolkits/gtk30/files/patch-ah
+++ b/x11-toolkits/gtk30/files/patch-ah
@@ -1,11 +1,11 @@
---- docs/Makefile.in.orig	2009-09-05 11:12:17.000000000 +0200
-+++ docs/Makefile.in	2009-09-05 11:16:52.000000000 +0200
-@@ -228,7 +228,7 @@ LTLIBOBJS = @LTLIBOBJS@
+--- docs/Makefile.in.orig	2010-01-18 01:13:15.000000000 -0500
++++ docs/Makefile.in	2010-01-18 01:14:29.000000000 -0500
+@@ -230,7 +230,7 @@ LTLIBOBJS = @LTLIBOBJS@
  LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
  LT_VERSION_INFO = @LT_VERSION_INFO@
  MAINT = @MAINT@
 -MAKEINFO = @MAKEINFO@
 +MAKEINFO = @MAKEINFO@ --no-split
+ MATH_LIB = @MATH_LIB@
  MKDIR_P = @MKDIR_P@
  MKINSTALLDIRS = @MKINSTALLDIRS@
- MSGFMT = @MSGFMT@
diff --git a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
index 8037cf952ad2..348bb57b8fdb 100644
--- a/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-gtk_Makefile.in
@@ -1,14 +1,17 @@
---- gtk/Makefile.in.orig	2009-09-05 11:21:40.000000000 +0200
-+++ gtk/Makefile.in	2009-09-05 11:22:57.000000000 +0200
-@@ -1310,9 +1310,9 @@ LDADDS = \
- 
- bin_SCRIPTS = gtk-builder-convert
+--- gtk/Makefile.in.orig	2010-01-18 01:17:13.000000000 -0500
++++ gtk/Makefile.in	2010-01-18 01:18:40.000000000 -0500
+@@ -1324,11 +1324,12 @@ bin_SCRIPTS = gtk-builder-convert $(am__
+ # gtk-update-icon-cache.exe doesn't require any special privileges.
+ @OS_WIN32_TRUE@GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
  gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS)
 -gtk_query_immodules_2_0_LDADD = $(LDADDS)
 +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GLIB_LIBS)
  gtk_query_immodules_2_0_SOURCES = queryimmodules.c
--gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
-+gtk_update_icon_cache_LDADD = $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la $(GLIB_LIBS)
+ gtk_update_icon_cache_LDADD = \
+ 	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la \
+-	$(GDK_PIXBUF_DEP_LIBS)
++	$(GDK_PIXBUF_DEP_LIBS) \
++	$(GLIB_LIBS)
+ 
  gtk_update_icon_cache_SOURCES = \
  	updateiconcache.c 
-