diff --git a/audio/clementine-player/Makefile b/audio/clementine-player/Makefile
index 33eb1dfdd580..aa12423effa1 100644
--- a/audio/clementine-player/Makefile
+++ b/audio/clementine-player/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clementine
-PORTVERSION=	0.4.2
+PORTVERSION=	0.6
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMESUFFIX=	-player
@@ -17,9 +17,12 @@ COMMENT=	A cross-platform music player based on Amarok 1.4
 LIB_DEPENDS=	lastfm.0:${PORTSDIR}/audio/liblastfm \
 		tag.1:${PORTSDIR}/audio/taglib \
 		notify.1:${PORTSDIR}/devel/libnotify \
-		xine.1:${PORTSDIR}/multimedia/libxine
+		xine.1:${PORTSDIR}/multimedia/libxine \
+		mtp:${PORTSDIR}/audio/libmtp
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
+LICENSE=	GPLv3
+
 PROJECTHOST=	${PORTNAME}${PKGNAMESUFFIX}
 
 USE_CMAKE=	yes
diff --git a/audio/clementine-player/distinfo b/audio/clementine-player/distinfo
index 6c7607f6d8e2..9cda648417b8 100644
--- a/audio/clementine-player/distinfo
+++ b/audio/clementine-player/distinfo
@@ -1,3 +1,2 @@
-MD5 (clementine-0.4.2.tar.gz) = c6819b0d2a8324f1d686fb5a3b1d287b
-SHA256 (clementine-0.4.2.tar.gz) = 07934347ea4922997524fca3bc5895d7accd52cf22f987922e814769e66996be
-SIZE (clementine-0.4.2.tar.gz) = 4670893
+SHA256 (clementine-0.6.tar.gz) = 7a7393af462a3c0864279d8cb2fc59afeec718837e5a1d0818a16b8a20d7cd0c
+SIZE (clementine-0.6.tar.gz) = 5601219
diff --git a/audio/clementine-player/files/patch-dist_clementine.desktop b/audio/clementine-player/files/patch-dist_clementine.desktop
index 6a4b055b5d00..7bde18ed1c63 100644
--- a/audio/clementine-player/files/patch-dist_clementine.desktop
+++ b/audio/clementine-player/files/patch-dist_clementine.desktop
@@ -1,9 +1,9 @@
---- dist/clementine.desktop.orig	2010-06-29 03:47:54.000000000 +0800
-+++ dist/clementine.desktop	2010-06-30 16:09:30.000000000 +0800
-@@ -4,8 +4,8 @@
- Name=Clementine
- GenericName=Clementine Music Player
+--- dist/clementine.desktop.orig	2010-11-03 20:46:26.000000000 +0100
++++ dist/clementine.desktop	2010-12-29 18:21:47.000000000 +0100
+@@ -6,8 +6,8 @@
+ GenericName[pt]=Reprodutor de músicas Clementine
  Comment=Plays music and last.fm streams
+ Comment[pt]=Reprodução de músicas e emissões last.fm
 -Exec=clementine
 -TryExec=clementine
 +Exec=clementine-player
diff --git a/audio/clementine-player/files/patch-src_CMakeLists.txt b/audio/clementine-player/files/patch-src_CMakeLists.txt
index 397d98ad8de4..341faa0db60c 100644
--- a/audio/clementine-player/files/patch-src_CMakeLists.txt
+++ b/audio/clementine-player/files/patch-src_CMakeLists.txt
@@ -1,6 +1,23 @@
---- src/CMakeLists.txt.orig	2010-06-30 16:09:59.000000000 +0800
-+++ src/CMakeLists.txt	2010-06-30 16:13:10.000000000 +0800
-@@ -509,6 +509,7 @@ add_executable(clementine
+--- src/CMakeLists.txt.orig	2010-12-10 15:26:29.000000000 +0100
++++ src/CMakeLists.txt	2010-12-29 19:47:49.000000000 +0100
+@@ -772,7 +772,6 @@
+   ${QTSINGLECOREAPPLICATION_LIBRARIES}
+   ${QTIOCOMPRESSOR_LIBRARIES}
+   ${CMAKE_THREAD_LIBS_INIT}
+-  dl
+   z
+ )
+ 
+@@ -842,7 +841,7 @@
+   # command but they're actually used by libraries that appear after them, so
+   # they end up getting ignored.  This appends them to the very end of the link
+   # line, ensuring they're always used.
+-  target_link_libraries(clementine_lib -lX11 -ldl)
++  target_link_libraries(clementine_lib -lX11)
+ endif (UNIX AND NOT APPLE)
+ 
+ add_dependencies(clementine_lib qtsingleapplication)
+@@ -870,6 +869,7 @@
    ${CLEMENTINE-WIN32-RESOURCES}
    main.cpp
  )
diff --git a/audio/clementine-player/pkg-descr b/audio/clementine-player/pkg-descr
index 203a02d31eaa..9b02fac96773 100644
--- a/audio/clementine-player/pkg-descr
+++ b/audio/clementine-player/pkg-descr
@@ -7,4 +7,4 @@ Features:
 - Edit tags on MP3 and OGG files, organise your music 
 - Download missing album cover art from Last.fm
 
-WWW:	http://code.google.com/p/clementine-player/
+WWW:	http://www.clementine-player.org
diff --git a/audio/clementine-player/pkg-plist b/audio/clementine-player/pkg-plist
index 90a197ba8036..a31ec081e294 100644
--- a/audio/clementine-player/pkg-plist
+++ b/audio/clementine-player/pkg-plist
@@ -1,6 +1,11 @@
 bin/clementine-player
 share/applications/clementine.desktop
 share/icons/hicolor/64x64/apps/application-x-clementine.png
+share/icons/hicolor/scalable/apps/application-x-clementine.svg
+share/icons/ubuntu-mono-dark/apps/24/clementine-panel.png
+share/icons/ubuntu-mono-dark/apps/24/clementine-panel-grey.png
+share/icons/ubuntu-mono-light/apps/24/clementine-panel.png
+share/icons/ubuntu-mono-light/apps/24/clementine-panel-grey.png
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Agitator.milk
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Gravity Directive Mix).milk
 %%VSL%%%%DATADIR%%/projectm-presets/Aderrasi - Aimless (Spirogravity Mix).milk
@@ -572,6 +577,12 @@ share/icons/hicolor/64x64/apps/application-x-clementine.png
 %%VSL%%%%DATADIR%%/projectm-presets/project.tga
 %%VSL%%%%DATADIR%%/projectm-presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk
 %%VSL%%%%DATADIR%%/projectm-presets/shifter - escape the worm - Eo.S. + Phat 5362.milk
-%%VSL%%@dirrm %%DATADIR%%
 %%VSL%%@dirrm %%DATADIR%%/projectm-presets
+%%VSL%%@dirrm %%DATADIR%%
 @dirrmtry share/applications
+@dirrmtry share/icons/ubuntu-mono-light/apps/24
+@dirrmtry share/icons/ubuntu-mono-light/apps
+@dirrmtry share/icons/ubuntu-mono-light
+@dirrmtry share/icons/ubuntu-mono-dark/apps/24
+@dirrmtry share/icons/ubuntu-mono-dark/apps
+@dirrmtry share/icons/ubuntu-mono-dark