diff --git a/x11/gnome/controlcenter/Makefile b/x11/gnome/controlcenter/Makefile
index 52f9e714df3..db2c2e61e81 100644
--- a/x11/gnome/controlcenter/Makefile
+++ b/x11/gnome/controlcenter/Makefile
@@ -1,46 +1,48 @@
-# $OpenBSD: Makefile,v 1.12 2001/11/30 09:18:42 wilfried Exp $
+# $OpenBSD: Makefile,v 1.13 2002/02/15 19:17:54 nino Exp $
 
 COMMENT=		"GNOME control center"
-V=			1.4.0.1
-DISTNAME=		control-center-${V}
+
+DISTNAME=		control-center-1.4.0.4
 CATEGORIES=		x11 x11/gnome
-NEED_VERSION=   	1.498
-HOMEPAGE=		http://www.gnome.org
+NEED_VERSION=   	1.504
+HOMEPAGE=		http://www.gnome.org/
+
 MAINTAINER=		Nils Nordman <nino@nforced.com>
 
 MASTER_SITES=		${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR= 	stable/sources/control-center
-
-PATCH_LIST=             ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
-                        ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
-                        patch-*
+EXTRACT_SUFX=		.tar.bz2
 
 LIB_DEPENDS=		gnomecanvaspixbuf,gdk_pixbuf::graphics/gdk-pixbuf,gnome \
 			gnome.36,gnorba,gtkxmhtml::x11/gnome/libs \
 			gnomevfs.::x11/gnome/vfs
+BUILD_DEPENDS=		:zsh-*:shells/zsh/stable
 
 BUILD_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
 RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
 			:gtk-engines->=0.12:x11/gtk-engines
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 USE_X11=		Yes
+MAKE_FLAGS+=		LIBTOOL='$(WRKBUILD)/sh $(WRKBUILD)/libtool'
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= 	--localstatedir=/var/gnome
 CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -loaf"
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+pre-build:
+	@ln -sf $(LOCALBASE)/bin/zsh ${WRKBUILD}/sh; \
+	cd ${WRKSRC}/control-center; ../xml-i18n-merge ../po gnomecc.desktop.in gnomecc.desktop -d -p
 
-post-extract:
-	@mv ${WRKSRC}/capplets/screensaver-properties/screensaver-desktops/Superquadrics.desktop.i \
-	    ${WRKSRC}/capplets/screensaver-properties/screensaver-desktops/Superquadrics.desktop.in;
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/control-center; \
-	cp -pR ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/control-center/
+	cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/control-center/
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/controlcenter/distinfo b/x11/gnome/controlcenter/distinfo
index a3b7d419275..3030c776efc 100644
--- a/x11/gnome/controlcenter/distinfo
+++ b/x11/gnome/controlcenter/distinfo
@@ -1,3 +1,3 @@
-MD5 (control-center-1.4.0.1.tar.gz) = 53e3d628a0d53a4b74e1ae8d8cb057ff
-RMD160 (control-center-1.4.0.1.tar.gz) = 363b3fa68f6cb137f4c710dc6ad7f3d6cb067540
-SHA1 (control-center-1.4.0.1.tar.gz) = f1b8f9103f5be4ba916f629eaf47663427a97a68
+MD5 (control-center-1.4.0.4.tar.bz2) = 6b1527dcbaa605dfb10e01cafb0f4437
+RMD160 (control-center-1.4.0.4.tar.bz2) = fb39b79d6ae0c5d6129c0fc84d1eb522130bc3eb
+SHA1 (control-center-1.4.0.4.tar.bz2) = 14a674e1e1226c67aee21be48f2ca4d9c6072c1f
diff --git a/x11/gnome/controlcenter/patches/patch-capplets_theme-switcher_lister_c b/x11/gnome/controlcenter/patches/patch-capplets_theme-switcher_lister_c
deleted file mode 100644
index cf5fad9f404..00000000000
--- a/x11/gnome/controlcenter/patches/patch-capplets_theme-switcher_lister_c
+++ /dev/null
@@ -1,36 +0,0 @@
-$OpenBSD: patch-capplets_theme-switcher_lister_c,v 1.1 2001/11/09 22:35:52 wilfried Exp $
---- capplets/theme-switcher/lister.c.orig	Sat Aug  5 22:25:36 2000
-+++ capplets/theme-switcher/lister.c	Thu Oct 25 13:32:58 2001
-@@ -159,16 +159,22 @@ edit_file_to_use (gchar *file, gchar *th
- 
-       while (!feof (fin))
- 	{
--	  getline (&lineptr, &linecount, fin);
--	  if (ferror(fin))
--	    {
--	      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
--					   file, g_strerror (errno));
--	      goto error;
--	    }
--	  
--	  if (!strcmp(MARK_STRING, lineptr))
--	    marker_count += 1;
-+	  if( getline (&lineptr, &linecount, fin) == -1 )
-+              {
-+              /* Doesn't have to be an error, could be a zerobyte file
-+               */
-+              if (ferror(fin))
-+                  {
-+                      errstring = g_strdup_printf ("Error reading from RC file %s: %s",
-+                                                   file, g_strerror (errno));
-+                      goto error;
-+                  }
-+              }
-+	  else
-+              {
-+              if (!strcmp(MARK_STRING, lineptr))
-+                  marker_count += 1;
-+              }
- 	}
-       rewind(fin);
-       if (!marker_count)
diff --git a/x11/gnome/controlcenter/patches/patch-configure b/x11/gnome/controlcenter/patches/patch-configure
index 614111a61a1..2a920164e2a 100644
--- a/x11/gnome/controlcenter/patches/patch-configure
+++ b/x11/gnome/controlcenter/patches/patch-configure
@@ -1,26 +1,14 @@
-$OpenBSD: patch-configure,v 1.4 2001/09/20 18:39:13 naddy Exp $
---- configure.orig	Wed Mar 28 21:46:14 2001
-+++ configure	Thu Sep 20 18:45:18 2001
-@@ -871,7 +871,10 @@ XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf
- XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
- 	$(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< $*.keys'
- 
--XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+#XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+#	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $*.desktop'
-+XML_I18N_MERGE_DESKTOP_RULE='.SUFFIXES: .desktop .desktop.in\
-+.desktop.in.desktop: $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
- 	$(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< $*.desktop'
- 
- XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-@@ -4380,6 +4383,10 @@ else
-   echo "$ac_t""no" 1>&6
+$OpenBSD: patch-configure,v 1.5 2002/02/15 19:17:54 nino Exp $
+--- configure.orig	Sun Feb  3 00:04:00 2002
++++ configure	Wed Feb  6 00:05:54 2002
+@@ -7945,6 +7945,10 @@ else
  fi
  
-+	   fi
-+
-+	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
-+	     LIBS="$LIBS -lintl";
  	   fi
++	
++       if test "$gt_cv_func_gettext_libintl" = "yes"; then
++           LIBS="$LIBS -lintl";
++       fi
  
  	   if test "$gt_cv_func_gettext_libc" = "yes" \
+ 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
diff --git a/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in b/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in
index 3a9d6dd46d0..b981b5530de 100644
--- a/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in
+++ b/x11/gnome/controlcenter/patches/patch-control-center_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-control-center_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
---- control-center/Makefile.in.orig	Thu Sep 20 18:32:49 2001
-+++ control-center/Makefile.in	Thu Sep 20 18:33:54 2001
-@@ -164,8 +164,7 @@ splash_DATA = ccsplash.png
+$OpenBSD: patch-control-center_Makefile_in,v 1.2 2002/02/15 19:17:54 nino Exp $
+--- control-center/Makefile.in.orig	Sun Feb  3 00:04:57 2002
++++ control-center/Makefile.in	Tue Feb  5 23:27:49 2002
+@@ -205,8 +205,7 @@ splash_DATA = ccsplash.png
  EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
  
  sysdir = $(datadir)/gnome/apps/Settings
diff --git a/x11/gnome/controlcenter/patches/patch-ltmain_sh b/x11/gnome/controlcenter/patches/patch-ltmain_sh
new file mode 100644
index 00000000000..6c6a3f22653
--- /dev/null
+++ b/x11/gnome/controlcenter/patches/patch-ltmain_sh
@@ -0,0 +1,72 @@
+$OpenBSD: patch-ltmain_sh,v 1.1 2002/02/15 19:17:54 nino Exp $
+--- ltmain.sh.orig	Sun Feb 10 22:36:46 2002
++++ ltmain.sh	Tue Feb 12 20:59:25 2002
+@@ -1060,6 +1060,17 @@ compiler."
+ 	continue
+ 	;;
+ 
++      -pthread)
++	case $host in
++	*-*-openbsd*)
++	  deplibs="$deplibs $arg"
++	  ;;
++	*)
++	  continue
++	  ;;
++	esac
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1500,6 +1511,9 @@ compiler."
+ 	  alldeplibs=yes
+ 	  continue
+ 	  ;;
++    -pthread)
++      continue
++      ;;
+ 	esac # case $deplib
+ 	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+@@ -4457,40 +4471,6 @@ relink_command=\"$relink_command\""
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/x11/gnome/controlcenter/patches/patch-omf-install_Makefile_in b/x11/gnome/controlcenter/patches/patch-omf-install_Makefile_in
index 6ac2bff9428..80393e4875d 100644
--- a/x11/gnome/controlcenter/patches/patch-omf-install_Makefile_in
+++ b/x11/gnome/controlcenter/patches/patch-omf-install_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-omf-install_Makefile_in,v 1.1.1.1 2001/09/13 21:38:02 todd Exp $
---- omf-install/Makefile.in.orig	Thu Sep 13 19:00:35 2001
-+++ omf-install/Makefile.in	Thu Sep 13 19:00:54 2001
-@@ -260,7 +260,6 @@ install-data-local:
+$OpenBSD: patch-omf-install_Makefile_in,v 1.2 2002/02/15 19:17:54 nino Exp $
+--- omf-install/Makefile.in.orig	Sun Feb  3 00:12:35 2002
++++ omf-install/Makefile.in	Tue Feb  5 23:27:49 2002
+@@ -274,7 +274,6 @@ install-data-local:
  	-for file in $(srcdir)/*.omf; do \
  		$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
  	done
diff --git a/x11/gnome/controlcenter/patches/patch-po_Makefile_in_in b/x11/gnome/controlcenter/patches/patch-po_Makefile_in_in
deleted file mode 100644
index 4cfc674f7df..00000000000
--- a/x11/gnome/controlcenter/patches/patch-po_Makefile_in_in
+++ /dev/null
@@ -1,67 +0,0 @@
-$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/09/18 20:28:53 naddy Exp $
---- po/Makefile.in.in.orig	Fri Mar  9 17:21:39 2001
-+++ po/Makefile.in.in	Tue Sep 18 19:49:56 2001
-@@ -25,6 +25,8 @@ gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
- 
-+DESTDIR =
-+
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
-@@ -112,16 +114,16 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  case "$$cat" in \
--	    *.gmo) destdir=$(gnulocaledir);; \
--	    *)     destdir=$(localedir);; \
-+	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
-+	    *)     destdir=$(DESTDIR)$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
-@@ -154,12 +156,12 @@ install-data-yes: all
- 	done
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- 	  fi; \
- 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(gettextsrcdir)/Makefile.in.in; \
-+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- 	else \
- 	  : ; \
- 	fi
-@@ -172,12 +174,12 @@ uninstall:
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
--	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
--	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
--	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-+	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
- 	done
--	rm -f $(gettextsrcdir)/po-Makefile.in.in
-+	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
- 
- check: all
- 
diff --git a/x11/gnome/controlcenter/pkg/INSTALL b/x11/gnome/controlcenter/pkg/INSTALL
index 027f986c1fa..47a52a0e917 100644
--- a/x11/gnome/controlcenter/pkg/INSTALL
+++ b/x11/gnome/controlcenter/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: INSTALL,v 1.2 2001/09/20 18:53:54 naddy Exp $
+# $OpenBSD: INSTALL,v 1.3 2002/02/15 19:17:54 nino Exp $
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
@@ -45,7 +45,10 @@ do_post() {
 	    echo "|"
 	fi
 	echo "| The following OLD configuration files was found and have NOT been overwritten:"
-	echo "| You should however manually compare it to it's equivalent in ${SOURCE_PFX}"
+	echo "| You should however manually compare them to their equivalents in "
+        echo "|"
+        echo "| ${SOURCE_PFX}"
+        echo "|"
 	echo "| and update your configuration if needed." 
 	echo "|"
 	for f in ${OLD_CONFS}; do
diff --git a/x11/gnome/controlcenter/pkg/PFRAG.shared b/x11/gnome/controlcenter/pkg/PFRAG.shared
index ef3c9cfab04..0b34793bfc6 100644
--- a/x11/gnome/controlcenter/pkg/PFRAG.shared
+++ b/x11/gnome/controlcenter/pkg/PFRAG.shared
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/18 20:28:53 naddy Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2002/02/15 19:17:54 nino Exp $
 lib/libcapplet.so.0.0
-DYNLIBDIR(%B)
+DYNLIBDIR(%D/lib)
diff --git a/x11/gnome/controlcenter/pkg/PLIST b/x11/gnome/controlcenter/pkg/PLIST
index ab6fcf7e740..9eba678fdd5 100644
--- a/x11/gnome/controlcenter/pkg/PLIST
+++ b/x11/gnome/controlcenter/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/09/20 18:53:54 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/02/15 19:17:54 nino Exp $
 bin/background-properties-capplet
 bin/file-types-capplet
 bin/gnome-edit-properties-capplet
@@ -11,10 +11,22 @@ bin/theme-selector-capplet
 bin/ui-properties
 bin/url-properties
 bin/wm-properties-capplet
-include/capplet-widget.h
+include/libcapplet1/capplet-widget.h
 lib/cappletConf.sh
 lib/libcapplet.a
 lib/libcapplet.la
+man/man1/background-properties-capplet.1
+man/man1/file-types-capplet.1
+man/man1/gnome-edit-properties-capplet.1
+man/man1/gnomecc.1
+man/man1/keyboard-properties.1
+man/man1/mouse-properties-capplet.1
+man/man1/screensaver-properties-capplet.1
+man/man1/sound-properties.1
+man/man1/theme-selector-capplet.1
+man/man1/ui-properties.1
+man/man1/url-properties.1
+man/man1/wm-properties-capplet.1
 share/control-center/.data/3d.desktop
 share/control-center/.data/3d.png
 share/control-center/.data/Ant.desktop
@@ -198,12 +210,9 @@ share/gnome/apps/Settings/Session/.directory
 share/gnome/apps/Settings/UIOptions/.directory
 share/gnome/apps/Settings/file-types-capplet.desktop
 share/gnome/apps/Settings/gnomecc.desktop
-share/gnome/help/control-center/C/alf.html
-share/gnome/help/control-center/C/authors.html
 share/gnome/help/control-center/C/control-center.sgml
 share/gnome/help/control-center/C/desktop-intro.html
 share/gnome/help/control-center/C/doc-handlers.html
-share/gnome/help/control-center/C/docbook.css
 share/gnome/help/control-center/C/figures/bg-capplet.png
 share/gnome/help/control-center/C/figures/gccalf.png
 share/gnome/help/control-center/C/figures/gccappdef.png
@@ -225,14 +234,8 @@ share/gnome/help/control-center/C/figures/screensave-capplet.png
 share/gnome/help/control-center/C/figures/theme-select.png
 share/gnome/help/control-center/C/figures/wm-add.png
 share/gnome/help/control-center/C/figures/wm-main.png
-share/gnome/help/control-center/C/filetypes.html
-share/gnome/help/control-center/C/gccui.html
 share/gnome/help/control-center/C/index.html
-share/gnome/help/control-center/C/license.html
 share/gnome/help/control-center/C/ln7.html
-share/gnome/help/control-center/C/multimedia-intro.html
-share/gnome/help/control-center/C/peripherals.html
-share/gnome/help/control-center/C/session.html
 share/gnome/help/control-center/C/stylesheet-images/caution.gif
 share/gnome/help/control-center/C/stylesheet-images/home.gif
 share/gnome/help/control-center/C/stylesheet-images/important.gif
@@ -275,6 +278,7 @@ share/locale/ja/LC_MESSAGES/control-center.mo
 share/locale/ko/LC_MESSAGES/control-center.mo
 share/locale/lt/LC_MESSAGES/control-center.mo
 share/locale/nl/LC_MESSAGES/control-center.mo
+share/locale/nn/LC_MESSAGES/control-center.mo
 share/locale/no/LC_MESSAGES/control-center.mo
 share/locale/pl/LC_MESSAGES/control-center.mo
 share/locale/pt/LC_MESSAGES/control-center.mo
@@ -287,8 +291,8 @@ share/locale/sv/LC_MESSAGES/control-center.mo
 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_TW.Big5/LC_MESSAGES/control-center.mo
+share/locale/zh_CN/LC_MESSAGES/control-center.mo
+share/locale/zh_TW/LC_MESSAGES/control-center.mo
 share/omf/control-center/control-center-C.omf
 share/pixmaps/ccsplash.png
 share/pixmaps/control-center.png
@@ -310,6 +314,6 @@ share/pixmaps/control-center.png
 @dirrm share/control-center/Desktop
 @dirrm share/control-center/.data
 @dirrm share/control-center
+@dirrm include/libcapplet1
 @exec %D/bin/scrollkeeper-update -p $(%D/bin/scrollkeeper-config --pkglocalstatedir)
 @unexec %D/bin/scrollkeeper-update -p $(%D/bin/scrollkeeper-config --pkglocalstatedir)
-