diff --git a/ncurses/Makefile b/ncursesw/Makefile
similarity index 56%
rename from ncurses/Makefile
rename to ncursesw/Makefile
index 3e71bb2..79bc263 100644
--- a/ncurses/Makefile
+++ b/ncursesw/Makefile
@@ -21,15 +21,6 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/libncurses
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Terminal handling library
-  URL:=http://www.gnu.org/software/ncurses/
-  VARIANT:=libncurses
-  DEPENDS:=@BROKEN
-endef
-
 define Package/libncursesw
   SECTION:=libs
   CATEGORY:=Libraries
@@ -55,13 +46,9 @@ CONFIGURE_ARGS += \
 	--with-normal \
 	--with-shared \
 	--with-terminfo-dirs=/usr/share/terminfo \
-	--with-default-terminfo-dir=/usr/share/terminfo
-
-ifeq ($(BUILD_VARIANT),libncursesw)
-	CONFIGURE_ARGS += \
-		--enable-widec \
-		--with-build-cppflags=-D_GNU_SOURCE
-endif
+	--with-default-terminfo-dir=/usr/share/terminfo \
+	--enable-widec \
+	--with-build-cppflags=-D_GNU_SOURCE
 
 MAKE_FLAGS += \
 	BUILD_CC="$(HOSTCC)" \
@@ -76,29 +63,11 @@ define Build/Install/Default
 		$(1) install.libs install.data;
 endef
 
-define Package/libncurses/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/share/terminfo
-	(cd $(PKG_INSTALL_DIR)/usr/share/terminfo; \
-		for dir in ??; do \
-			[ -d "$$$$dir" ] || continue; \
-			mv $$$$dir $$$$(echo -ne "\x$$$$dir"); \
-		done \
-	)
-	for file in a/ansi d/dumb l/linux r/rxvt r/rxvt-unicode s/screen v/vt100 v/vt102 x/xterm x/xterm-color; do \
-		$(INSTALL_DIR) $(1)/usr/share/terminfo/`dirname $$$$file`; \
-		$(CP) $(PKG_INSTALL_DIR)/usr/share/terminfo/$$$$file \
-			$(1)/usr/share/terminfo/$$$$file; \
-	done
-endef
-
 define Package/libncursesw/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.so* $(1)/usr/lib/
 endef
 
-ifeq ($(BUILD_VARIANT),libncursesw)
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/ncursesw/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/ncursesw/
@@ -106,15 +75,5 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{ncurses,panel,menu,form}w.{a,so*} $(1)/usr/lib/
 endef
-else
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/*.h $(1)/usr/include/
 
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{curses,ncurses,panel,menu,form}.{a,so*} $(1)/usr/lib/
-endef
-endif
-
-$(eval $(call BuildPackage,libncurses))
 $(eval $(call BuildPackage,libncursesw))
diff --git a/ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch b/ncursesw/patches/100-ncurses-5.6-20080112-urxvt.patch
similarity index 100%
rename from ncurses/patches/100-ncurses-5.6-20080112-urxvt.patch
rename to ncursesw/patches/100-ncurses-5.6-20080112-urxvt.patch
diff --git a/ncurses/patches/101-ncurses-5.6-20080628-kbs.patch b/ncursesw/patches/101-ncurses-5.6-20080628-kbs.patch
similarity index 100%
rename from ncurses/patches/101-ncurses-5.6-20080628-kbs.patch
rename to ncursesw/patches/101-ncurses-5.6-20080628-kbs.patch
diff --git a/ncurses/patches/500-cross.patch b/ncursesw/patches/500-cross.patch
similarity index 100%
rename from ncurses/patches/500-cross.patch
rename to ncursesw/patches/500-cross.patch
diff --git a/ncurses/patches/900-terminfo.patch b/ncursesw/patches/900-terminfo.patch
similarity index 100%
rename from ncurses/patches/900-terminfo.patch
rename to ncursesw/patches/900-terminfo.patch