diff --git a/haiku-apps/behappy/behappy-1.06e_git.recipe b/haiku-apps/behappy/behappy-1.06e_git.recipe
index 53fdbfd33..b7157680b 100644
--- a/haiku-apps/behappy/behappy-1.06e_git.recipe
+++ b/haiku-apps/behappy/behappy-1.06e_git.recipe
@@ -34,14 +34,18 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	cd trunk
 	make BUILDHOME=/system/develop
 }
 
 INSTALL()
 {
-	cd trunk
-	make install BUILDHOME=/system/develop
+	mkdir -p $appsDir/BeHappy
+	make install BUILDHOME=/system/develop INSTALL_DIR=$appsDir/BeHappy
+
+	mkdir $appsDir/BeHappy/Add-ons/
+	mv $appsDir/BeHappy/BeBook $appsDir/BeHappy/Man $appsDir/BeHappy/BeHappyDoc \
+		$appsDir/BeHappy/Add-ons/
+
 	addAppDeskbarSymlink $appsDir/BeHappy/BeHappy
 }