diff --git a/Makefile b/Makefile
index fb57eea27b..8cedc4ab13 100644
--- a/Makefile
+++ b/Makefile
@@ -4635,9 +4635,9 @@ SUBDIR+=	symon
 SUBDIR+=	sympol
 SUBDIR+=	sympow
 SUBDIR+=	syn68k
-SUBDIR+=	sync-server-dependencies
 SUBDIR+=	synce-dynamite
 SUBDIR+=	synce-orange
+SUBDIR+=	syncserver-dependencies
 SUBDIR+=	syncthing-discosrv
 SUBDIR+=	syncthing-inotify
 SUBDIR+=	syncthing-relaysrv
@@ -5022,6 +5022,7 @@ SUBDIR+=	xfs
 SUBDIR+=	xine-plugin
 SUBDIR+=	xinetd
 SUBDIR+=	xinput_calibrator
+SUBDIR+=	xinvaders3d
 SUBDIR+=	xmail
 SUBDIR+=	xmakemol
 SUBDIR+=	xmds
diff --git a/sync-server-dependencies/DESCR b/syncserver-dependencies/DESCR
similarity index 100%
rename from sync-server-dependencies/DESCR
rename to syncserver-dependencies/DESCR
diff --git a/sync-server-dependencies/Makefile b/syncserver-dependencies/Makefile
similarity index 78%
rename from sync-server-dependencies/Makefile
rename to syncserver-dependencies/Makefile
index e66c717ba8..ac22333cc4 100644
--- a/sync-server-dependencies/Makefile
+++ b/syncserver-dependencies/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	sync-server-dependencies-1.1
+DISTNAME=	syncserver-dependencies-1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	misc
 MASTER_SITES=	#
@@ -12,9 +12,8 @@ LICENSE=	public-domain
 
 USE_TOOLS+=	gmake:run
 
-DEPENDS+=	${PYPKGPREFIX}-sqlite2-[0-9]*:../../databases/py-sqlite2
+DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	${PYPKGPREFIX}-virtualenv-[0-9]*:../../devel/py-virtualenv
-DEPENDS+=	mercurial-[0-9]*:../../devel/mercurial
 DEPENDS+=	sqlite3-[0-9]*:../../databases/sqlite3
 
 META_PACKAGE=	yes
diff --git a/sync-server-dependencies/options.mk b/syncserver-dependencies/options.mk
similarity index 100%
rename from sync-server-dependencies/options.mk
rename to syncserver-dependencies/options.mk