diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index e08c854a6ff1..d725497c67e7 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.0.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
 DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 271e9c261fc3..85bb35d7b345 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.4.0.3.tar.gz) = b81b2599dbeb2e5204b8b4cecd455ad1
+MD5 (gnome/control-center-1.4.0.4.tar.bz2) = 6b1527dcbaa605dfb10e01cafb0f4437
diff --git a/sysutils/gnome-control-center/files/patch-cf b/sysutils/gnome-control-center/files/patch-cf
deleted file mode 100644
index 7235390496ef..000000000000
--- a/sysutils/gnome-control-center/files/patch-cf
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/theme-switcher/lister.c.orig	Mon Nov 27 11:39:55 2000
-+++ capplets/theme-switcher/lister.c	Mon Nov 27 11:18:25 2000
-@@ -160,6 +160,8 @@
-       while (!feof (fin))
- 	{
- 	  getline (&lineptr, &linecount, fin);
-+          if (feof(fin))
-+            break;
- 	  if (ferror(fin))
- 	    {
- 	      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
-
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 384fba38b220..7032f0daa04f 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -283,6 +283,7 @@ share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/omf/control-center
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index e08c854a6ff1..d725497c67e7 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.0.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
 DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo
index 271e9c261fc3..85bb35d7b345 100644
--- a/sysutils/gnome-control-center1/distinfo
+++ b/sysutils/gnome-control-center1/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.4.0.3.tar.gz) = b81b2599dbeb2e5204b8b4cecd455ad1
+MD5 (gnome/control-center-1.4.0.4.tar.bz2) = 6b1527dcbaa605dfb10e01cafb0f4437
diff --git a/sysutils/gnome-control-center1/files/patch-cf b/sysutils/gnome-control-center1/files/patch-cf
deleted file mode 100644
index 7235390496ef..000000000000
--- a/sysutils/gnome-control-center1/files/patch-cf
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/theme-switcher/lister.c.orig	Mon Nov 27 11:39:55 2000
-+++ capplets/theme-switcher/lister.c	Mon Nov 27 11:18:25 2000
-@@ -160,6 +160,8 @@
-       while (!feof (fin))
- 	{
- 	  getline (&lineptr, &linecount, fin);
-+          if (feof(fin))
-+            break;
- 	  if (ferror(fin))
- 	    {
- 	      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
-
diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist
index 384fba38b220..7032f0daa04f 100644
--- a/sysutils/gnome-control-center1/pkg-plist
+++ b/sysutils/gnome-control-center1/pkg-plist
@@ -283,6 +283,7 @@ share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/omf/control-center
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index e08c854a6ff1..d725497c67e7 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.0.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
 DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo
index 271e9c261fc3..85bb35d7b345 100644
--- a/sysutils/gnomecontrolcenter/distinfo
+++ b/sysutils/gnomecontrolcenter/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.4.0.3.tar.gz) = b81b2599dbeb2e5204b8b4cecd455ad1
+MD5 (gnome/control-center-1.4.0.4.tar.bz2) = 6b1527dcbaa605dfb10e01cafb0f4437
diff --git a/sysutils/gnomecontrolcenter/files/patch-cf b/sysutils/gnomecontrolcenter/files/patch-cf
deleted file mode 100644
index 7235390496ef..000000000000
--- a/sysutils/gnomecontrolcenter/files/patch-cf
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/theme-switcher/lister.c.orig	Mon Nov 27 11:39:55 2000
-+++ capplets/theme-switcher/lister.c	Mon Nov 27 11:18:25 2000
-@@ -160,6 +160,8 @@
-       while (!feof (fin))
- 	{
- 	  getline (&lineptr, &linecount, fin);
-+          if (feof(fin))
-+            break;
- 	  if (ferror(fin))
- 	    {
- 	      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
-
diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist
index 384fba38b220..7032f0daa04f 100644
--- a/sysutils/gnomecontrolcenter/pkg-plist
+++ b/sysutils/gnomecontrolcenter/pkg-plist
@@ -283,6 +283,7 @@ share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/omf/control-center
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index e08c854a6ff1..d725497c67e7 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,17 +6,19 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION=	1.4.0.3
+PORTVERSION=	1.4.0.4
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
 DISTNAME=	control-center-${PORTVERSION}
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 
 LIB_DEPENDS=	gnomecanvaspixbuf.1:${PORTSDIR}/graphics/gnomecanvas \
 		gnomevfs.0:${PORTSDIR}/devel/gnomevfs
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 271e9c261fc3..85bb35d7b345 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1 +1 @@
-MD5 (control-center-1.4.0.3.tar.gz) = b81b2599dbeb2e5204b8b4cecd455ad1
+MD5 (gnome/control-center-1.4.0.4.tar.bz2) = 6b1527dcbaa605dfb10e01cafb0f4437
diff --git a/sysutils/gnomecontrolcenter2/files/patch-cf b/sysutils/gnomecontrolcenter2/files/patch-cf
deleted file mode 100644
index 7235390496ef..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-cf
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/theme-switcher/lister.c.orig	Mon Nov 27 11:39:55 2000
-+++ capplets/theme-switcher/lister.c	Mon Nov 27 11:18:25 2000
-@@ -160,6 +160,8 @@
-       while (!feof (fin))
- 	{
- 	  getline (&lineptr, &linecount, fin);
-+          if (feof(fin))
-+            break;
- 	  if (ferror(fin))
- 	    {
- 	      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
-
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 384fba38b220..7032f0daa04f 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -283,6 +283,7 @@ share/locale/tr/LC_MESSAGES/control-center.mo
 share/locale/uk/LC_MESSAGES/control-center.mo
 share/locale/wa/LC_MESSAGES/control-center.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
 share/locale/zh_TW/LC_MESSAGES/control-center.mo
 @dirrm share/gnome/wm-properties
 @dirrm share/gnome/omf/control-center