diff --git a/network/openvas-server/openvas-server.cache b/network/openvas-scanner/openvas-scanner.cache
similarity index 100%
rename from network/openvas-server/openvas-server.cache
rename to network/openvas-scanner/openvas-scanner.cache
diff --git a/network/openvas-server/openvas-server.conf b/network/openvas-scanner/openvas-scanner.conf
similarity index 63%
rename from network/openvas-server/openvas-server.conf
rename to network/openvas-scanner/openvas-scanner.conf
index e9d2469d2..fa3ed1134 100644
--- a/network/openvas-server/openvas-server.conf
+++ b/network/openvas-scanner/openvas-scanner.conf
@@ -1,8 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../openvas-server/openvas-server.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Filename: package/.../openvas-scanner/openvas-scanner.conf
+# Copyright (C) 2007 - 2011 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -12,6 +12,5 @@
 # GNU General Public License can be found in the file COPYING.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-# this is a hack that circumvents some issues with the build system
-# to be able to compile openvas-server using an alternative prefix
-var_remove_regex makeopt ' ' "prefix\=.*"
+# cannot be build within a dedicated build directory
+cmakebuilddir=0
diff --git a/network/openvas-server/openvas-server.desc b/network/openvas-scanner/openvas-scanner.desc
similarity index 89%
rename from network/openvas-server/openvas-server.desc
rename to network/openvas-scanner/openvas-scanner.desc
index 5da14f9d9..822f3c6b4 100644
--- a/network/openvas-server/openvas-server.desc
+++ b/network/openvas-scanner/openvas-scanner.desc
@@ -1,7 +1,7 @@
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
-[COPY] Filename: package/.../openvas-server/openvas-server.desc
+[COPY] Filename: package/.../openvas-scanner/openvas-scanner.desc
 [COPY] Copyright (C) 2007 - 2011 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
@@ -32,9 +32,9 @@
 
 [L] GPL
 [S] Beta
-[V] 2.0.3
+[V] 3.2.3
 [P] X -----5---9 218.200
 
 [O] . $base/package/*/*/openvas-conf.in
 
-[D] 3126006912 openvas-server-2.0.3.tar.gz http://wald.intevation.org/frs/download.php/624/
+[D] 2136406281 openvas-scanner-3.2.3.tar.gz http://wald.intevation.org/frs/download.php/862/