diff --git a/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs b/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs
index 2c7ae83..38087e4 100644
--- a/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs
+++ b/gmenu2x/files/nanonote/gmenu2x/sections/applications/emacs
@@ -1,3 +1,3 @@
 title=emacs
 icon=skin:icons/utilities-terminal.png
-exec=/usr/bin/emacs@BROKEN
+exec=/usr/bin/emacs
diff --git a/nethack/Makefile b/nethack/Makefile
index 4c39195..e843bd4 100644
--- a/nethack/Makefile
+++ b/nethack/Makefile
@@ -32,6 +32,15 @@ endef
 TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include
 TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
 
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	(mkdir -p $(PKG_BUILD_DIR)/jemarch-bin; \
+	cd $(PKG_BUILD_DIR)/; \
+	wget http://www.jemarch.net/downloads/nanonote/nethack-3.4.3-nanonote-bin.tar.gz; \
+	tar xf nethack-3.4.3-nanonote-bin.tar.gz -C jemarch-bin/; \
+	)
+endef
+
 define Build/Compile
 	(cd $(PKG_BUILD_DIR)/sys/unix; \
 	sh setup.sh; \
@@ -46,8 +55,17 @@ endef
 define Package/nethack/install
 	$(INSTALL_DIR) \
 		$(1)/usr/bin \
+		$(1)/usr/lib/nethackdir
 
 	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/src/nethack \
+		$(1)/usr/lib/nethackdir/
+
+	$(CP) \
+		$(PKG_BUILD_DIR)/jemarch-bin/nethack-3.4.3-nanonote-bin/lib/nethackdir/*
+		$(1)/usr/lib/nethackdir/
+
+	$(CP) \
 		$(PKG_BUILD_DIR)/src/nethack \
 		$(1)/usr/bin/
 endef