diff --git a/net/gmediaserver/Makefile b/multimedia/gmediaserver/Makefile
similarity index 96%
rename from net/gmediaserver/Makefile
rename to multimedia/gmediaserver/Makefile
index ab51e33b9..926edebf4 100644
--- a/net/gmediaserver/Makefile
+++ b/multimedia/gmediaserver/Makefile
@@ -22,12 +22,11 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
 define Package/gmediaserver
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
   DEPENDS:=+id3lib +libmagic +file +libupnp +libuuid +uclibcxx +zlib $(ICONV_DEPENDS)
   TITLE:=An UPnP music media server
   URL:=http://www.nongnu.org/gmediaserver/
-  SUBMENU:=multimedia
 endef
 
 define Package/gmediaserver/description
diff --git a/net/gmediaserver/files/gmediaserver.config b/multimedia/gmediaserver/files/gmediaserver.config
similarity index 100%
rename from net/gmediaserver/files/gmediaserver.config
rename to multimedia/gmediaserver/files/gmediaserver.config
diff --git a/net/gmediaserver/files/gmediaserver.init b/multimedia/gmediaserver/files/gmediaserver.init
similarity index 100%
rename from net/gmediaserver/files/gmediaserver.init
rename to multimedia/gmediaserver/files/gmediaserver.init
diff --git a/net/gmediaserver/patches/010-compile-fixes.patch b/multimedia/gmediaserver/patches/010-compile-fixes.patch
similarity index 100%
rename from net/gmediaserver/patches/010-compile-fixes.patch
rename to multimedia/gmediaserver/patches/010-compile-fixes.patch
diff --git a/net/icecast/Makefile b/multimedia/icecast/Makefile
similarity index 97%
rename from net/icecast/Makefile
rename to multimedia/icecast/Makefile
index 2aad28bc9..684bede32 100644
--- a/net/icecast/Makefile
+++ b/multimedia/icecast/Makefile
@@ -23,12 +23,11 @@ TREMOR_BUILD_DIR=$(PKG_BUILD_DIR)/libvorbisidec-1.2.0-dave
 TREMOR_DIR=$(TREMOR_BUILD_DIR)/ipkg-install/usr
 
 define Package/icecast
-  SECTION:=net
-  CATEGORY:=Network
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
   DEPENDS:=+libcurl +libxml2 +libxslt +libogg
   TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
   URL:=http://www.icecast.org/
-  SUBMENU:=multimedia
 endef
 
 define Package/icecast/description
diff --git a/net/icecast/libvorbisidec.mk b/multimedia/icecast/libvorbisidec.mk
similarity index 100%
rename from net/icecast/libvorbisidec.mk
rename to multimedia/icecast/libvorbisidec.mk
diff --git a/net/icecast/patches/001-icecast-2.3.0-tremor.patch b/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch
similarity index 100%
rename from net/icecast/patches/001-icecast-2.3.0-tremor.patch
rename to multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch
diff --git a/net/icecast/patches/010-fix_libcurl_test_crap.patch b/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch
similarity index 100%
rename from net/icecast/patches/010-fix_libcurl_test_crap.patch
rename to multimedia/icecast/patches/010-fix_libcurl_test_crap.patch