diff --git a/srcpkgs/doxygen/doxygen-gui.template b/srcpkgs/doxygen/doxygen-gui.template
index d0e4be76f1..5c94358a1e 100644
--- a/srcpkgs/doxygen/doxygen-gui.template
+++ b/srcpkgs/doxygen/doxygen-gui.template
@@ -1,17 +1,9 @@
 # Template file for 'doxygen-gui'.
 #
-depends="doxygen"
+depends="doxygen>=${version}"
 short_desc="Qt GUI configuration tool for doxygen"
-long_desc="${long_desc}
 
- This package contains doxywizard, a Qt GUI configuration tool for
- doxygen."
-
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1
-	mv ${SRCPKGDESTDIR}/usr/bin/doxywizard ${DESTDIR}/usr/bin
-	mv ${SRCPKGDESTDIR}/usr/share/man/man1/doxywizard.1 \
-		${DESTDIR}/usr/share/man/man1
+do_install() {
+	vmove usr/bin/doxywizard usr/bin
+	vmove usr/share/man/man1/doxywizard.1 usr/share/man/man1
 }
diff --git a/srcpkgs/doxygen/template b/srcpkgs/doxygen/template
index f31d2d7c7c..436b084848 100644
--- a/srcpkgs/doxygen/template
+++ b/srcpkgs/doxygen/template
@@ -1,19 +1,15 @@
 # Template file for 'doxygen'
 pkgname=doxygen
-version=1.8.2
+version=1.8.3
 revision=1
-subpackages="$pkgname-gui"
+subpackages="${pkgname}-gui"
 makedepends="perl flex qt-devel"
 short_desc="Source code documentation generator tool"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.doxygen.org/"
 license="GPL-2"
-distfiles="http://ftp.stack.nl/pub/users/dimitri/$pkgname-$version.src.tar.gz"
-checksum=5c839ef7faa9412817e9fba596f24b9cd7ad923d1c16c35e256d14caf05c8448
-long_desc="
- Doxygen is a documentation system for C++, C, Java, Objective-C, Python,
- IDL (Corba and Microsoft flavors), Fortran, VHDL, PHP, C#, and to some
- extent D."
+distfiles="http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${version}.src.tar.gz"
+checksum=3ed9305f0cb8107564b0c1aaf5107385e277d4c03d98fe949c93d92d6e286986
 
 do_configure() {
 	./configure --prefix /usr --with-doxywizard