diff --git a/haiku-apps/album/album-0.9.2.recipe b/haiku-apps/album/album-0.9.2.recipe
index 58c428455..59033453d 100644
--- a/haiku-apps/album/album-0.9.2.recipe
+++ b/haiku-apps/album/album-0.9.2.recipe
@@ -1,20 +1,55 @@
-DESCRIPTION="An image viewer/organiser designed for BeOS-compatible operating systems"
+SUMMARY="An image viewer/organiser designed for BeOS-compatible operating systems."
+DESCRIPTION="Album is a file browsing and tagging utility for BeOS and compatibles. It
+started out with a goal of the ultimate image organiser (code named Aberration), but ended
+up as something much more modest and BeOS-specific. The idea is to have a work pad for
+pictures from different locations where they can be previewed and tagged in one place. The
+program is not limited to picture files and BFS (Be File System) volumes, although that
+further limits whatever the usefulness since much of the functionality has to do with file
+attributes."
 HOMEPAGE="http://users.volja.net/mkovac1/proj/album/"
-SRC_URI="http://users.volja.net/mkovac1/proj/album/album-0.9.2.zip"
-CHECKSUM_MD5="d22d1850ba5807c5da0432ecd530c372"
-STATUS_HAIKU="stable"
-REVISION="1"
-DEPEND=" "
+SRC_URI="git://github.com/HaikuArchives/Album"
+#CHECKSUM_MD5=" "
+LICENSE="MIT"
+COPYRIGHT="2006-2009 by Matjaž Kovač"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+PROVIDES="
+	Album = $portVersion
+	app:Album = $portVersion
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+
+BUILD_REQUIRES=" "
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	makefile_engine
+	cmd:gcc
+	cmd:make
+	cmd:mkdepend
+	"
+
+PATCHES="album-0.9.2.patch"
+USER_SETTINGS_FILES="
+	settings/Album directory
+	"
+
+SOURCE_DIR="$portVersionedName/src"
+
 BUILD()
 {
-	cd album-0.9.2/src
-	make
+	make BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
+
 INSTALL()
 {
-	cd album-0.9.2
-	mkdir -p ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album
-	cp -a Album ${DESTDIR}/`finddir B_APPS_DIRECTORY`/Album
+	albumDir=$appsDir/Album
+	mkdir -p $albumDir
+
+	cp -a objects.x86-gcc2-debug/Album $albumDir
+
+	addAppDeskbarSymlink $albumDir/Album
 }
-LICENSE="MIT"
-COPYRIGHT="2006-2009 by Matjaž Kovač"
\ No newline at end of file
diff --git a/haiku-apps/album/patches/album-0.9.2.patch b/haiku-apps/album/patches/album-0.9.2.patch
new file mode 100644
index 000000000..71f819683
--- /dev/null
+++ b/haiku-apps/album/patches/album-0.9.2.patch
@@ -0,0 +1,13 @@
+diff --git a/MainWindow.cpp b/MainWindow.cpp
+index 4fcb98a..66ed596 100644
+--- a/MainWindow.cpp
++++ b/MainWindow.cpp
+@@ -142,7 +142,7 @@ MainWindow::MainWindow(BRect frame, const char *title):
+ 	
+ 	// Create a tempory repository for negotiated drops from image ditors etc.
+ 	BPath path;
+-	if (find_directory(B_COMMON_TEMP_DIRECTORY, &path) == B_OK) {
++	if (find_directory(B_SYSTEM_TEMP_DIRECTORY, &path) == B_OK) {
+ 		path.Append("Album");
+ 		if (create_directory(path.Path(), 0x777) == B_OK) {
+ 			fRepository.SetTo(path.Path());