diff --git a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
index 69b40119a..a97b3960a 100644
--- a/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
+++ b/haiku-apps/cherry_blossom/cherry_blossom-1.0.recipe
@@ -1,14 +1,16 @@
-SUMMARY="Cherry Blossom is media player for the Haiku Operating System"
+SUMMARY="A media player for the Haiku Operating System"
 DESCRIPTION="
 Cherry Blossom is a 100% native application. Cherry Blossom uses Haiku \
 specific API’s for handling media, so if Haiku can play your media files, then \
 Cherry Blossom will also be able to play your files."
-HOMEPAGE="http://gitorious.org/cherry-blossom/"
+HOMEPAGE="https://github.com/HaikuArchives/CherryBlossom/"
 COPYRIGHT="2010 Bryce Groff"
 LICENSE="MIT"
-REVISION="2"
-SOURCE_URI="git+http://gitorious.org/cherry-blossom/cherry-blossom.git"
-PATCHES="cherry_blossom-1.0.patch"
+REVISION="3"
+srcGitRev="1f2804193deaf9fb08b1578c88ad846b6b15f5c8"
+SOURCE_URI="https://github.com/HaikuArchives/CherryBlossom/archive/$srcGitRev.tar.gz"
+CHECKSUM_SHA256="757fec333986a791591a0fe5dcfff2db533cf2b73bab8a1a1661c745d9172ed3"
+SOURCE_DIR="CherryBlossom-$srcGitRev"
 
 ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
 
@@ -18,11 +20,12 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku
+	lib:libtag
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	taglib_devel
+	devel:libtag
 	"
 BUILD_PREREQUIRES="
 	makefile_engine
@@ -32,12 +35,14 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
+	cd src
 	make OBJ_DIR=objects \
 		BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 
 INSTALL()
 {
+	cd src
 	mkdir -p ${appsDir}
 	cp -a objects/Cherry_Blossom $appsDir
 	addAppDeskbarSymlink ${appsDir}/Cherry_Blossom
diff --git a/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch b/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch
deleted file mode 100644
index 984da661e..000000000
--- a/haiku-apps/cherry_blossom/patches/cherry_blossom-1.0.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/makefile b/makefile
-new file mode 100644
-index 0000000..d134de0
---- /dev/null
-+++ b/makefile
-@@ -0,0 +1,30 @@
-+NAME= Cherry_Blossom
-+
-+TYPE= APP
-+
-+SRCS= interface/DrawingTidbits.cpp \
-+interface/PositionToolTip.cpp \
-+interface/TransportButton.cpp \
-+interface/PeakView.cpp \
-+interface/SeekSlider.cpp \
-+interface/VolumeSlider.cpp \
-+views/AlbumView.cpp \
-+views/ControlView.cpp \
-+views/MusicView.cpp \
-+views/SearchView.cpp \
-+views/ArtistView.cpp \
-+views/GenreView.cpp \
-+views/PlayListView.cpp \
-+views/SongView.cpp \
-+CherryBlossom.cpp \
-+CherryBlossomWindow.cpp \
-+
-+SYSTEM_INCLUDE_PATHS = /boot/system/develop/headers/private/interface/ \
-+	/boot/system/develop/headers/private/shared/
-+
-+
-+LIBS= be locale tag
-+
-+APP_VERSION = 1.0
-+
-+include $(BUILDHOME)/etc/makefile-engine