diff --git a/eclass/vmware-1.eclass b/eclass/vmware-1.eclass
index d49b35c2..06c74594 100644
--- a/eclass/vmware-1.eclass
+++ b/eclass/vmware-1.eclass
@@ -60,6 +60,8 @@ vmware-1_determine_product() {
 			;;
 		server-console)
 			FULL_NAME="Server Console"
+			SRC_URI="mirror://vmware/software/vmserver/${VM_SRC}"
+			HOMEPAGE="http://www.vmware.com/download/server/"
 			config_program="vmware-config-server-console.pl"
 			config_dir="/etc/${PN}"
 			;;
@@ -80,13 +82,13 @@ RESTRICT="strip"
 
 vmware-1_determine_product
 
-#if [ -n "${VM_SRC_EXTRA}" ]
-#then
+if [ -n "${VM_SRC_EXTRA}" ]
+then
 	for a in ${VM_SRC_EXTRA}
 	do
 		SRC_URI="${SRC_URI} http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
 	done
-#fi
+fi
 
 export VMWARE_GROUP=${VMWARE_GROUP:-vmware}
 export VMWARE_INSTALL_DIR=/opt/${PN//-//}
@@ -123,10 +125,13 @@ vmware-1_pkg_setup() {
 
 vmware-1_src_unpack() {
 	unpack ${VM_SRC}
-	for a in ${VM_SRC_EXTRA}
-	do
-		unpack ${P/_p/-}-${a}.tar.bz2
-	done
+	if [ -n "${VM_SRC_EXTRA}" ]
+	then
+		for a in ${VM_SRC_EXTRA}
+		do
+			unpack ${P/_p/-}-${a}.tar.bz2
+		done
+	fi
 }
 
 vmware-1_src_prepare() {
@@ -381,10 +386,13 @@ vmware-1_pkg_nofetch() {
 	einfo "This files require you to register at www.vmware.com"
 	einfo "Please download following files:"
 	einfo " - ${VM_SRC} from ${HOMEPAGE}"
-	for a in ${VM_SRC_EXTRA}
-	do
-		einfo " - http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
-	done
+	if [ -n "${VM_SRC_EXTRA}" ]
+	then
+		for a in ${VM_SRC_EXTRA}
+		do
+			einfo " - http://ftp.mars.arge.at/vmware/${P/_p/-}-${a}.tar.bz2"
+		done
+	fi
 	einfo "and place them in ${DISTDIR}"
 }