diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index fdacdd45a4..f2b8c58afc 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -2,13 +2,13 @@
 
 COMMENT = console audio player
 
-DISTNAME = moc-2.5.0
+DISTNAME = moc-2.6-alpha1
 CATEGORIES = audio
 
 HOMEPAGE = http://moc.daper.net/
 
-MASTER_SITES = http://ftp.daper.net/pub/soft/moc/stable/
-EXTRACT_SUFX = .tar.bz2
+MASTER_SITES = http://ftp.daper.net/pub/soft/moc/unstable/
+EXTRACT_SUFX = .tar.xz
 
 # License: GPLv3+
 PERMIT_PACKAGE_CDROM = Yes
@@ -17,10 +17,10 @@ PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB = db>=4
 WANTLIB += FLAC avcodec avformat avutil bz2 c crypto curl faad
-WANTLIB += gsm id3tag idn ltdl m mad mp3lame mpcdec ncursesw ogg
-WANTLIB += opus pthread samplerate sndfile sndio speex ssl stdc++
-WANTLIB += swresample tag tag_c vorbis vorbisenc vorbisfile vpx
-WANTLIB += wavpack x264 x265 xvidcore z
+WANTLIB += gsm id3tag idn ltdl m mad magic mp3lame mpcdec ncursesw
+WANTLIB += ogg opus pthread samplerate sndfile sndio speex ssl
+WANTLIB += stdc++ swresample tag tag_c vorbis vorbisenc vorbisfile
+WANTLIB += vpx wavpack x264 x265 xvidcore z
 
 MODULES = devel/gettext
 
@@ -38,6 +38,7 @@ LIB_DEPENDS = \
 			audio/wavpack \
 			databases/db/v4 \
 			devel/libidn \
+			devel/libmagic \
 			devel/libtool,-ltdl \
 			graphics/ffmpeg \
 			net/curl
diff --git a/audio/moc/UPDATE b/audio/moc/UPDATE
index f8f0f30f50..87282232be 100644
--- a/audio/moc/UPDATE
+++ b/audio/moc/UPDATE
@@ -1,3 +1,7 @@
+2015-07-17 Michael Seyfert <michael@codesand.org>
+
+ * Update to 2.6-alpha1, This should be just as stable as 2.5.0.
+
 2015-06-20 Michael Seyfert <michael@codesand.org>
 
 1. License should be GPLv3+ due to embedded code in md5.c.
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
index 9709c79033..4709217353 100644
--- a/audio/moc/distinfo
+++ b/audio/moc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (moc-2.5.0.tar.bz2) = 0p6lIkCvdsSqVvopNVPanWZnWCPmiSSc7l+KYGV6YJE=
-SIZE (moc-2.5.0.tar.bz2) = 594532
+SHA256 (moc-2.6-alpha1.tar.xz) = Cwo1FcZbTEeiUONQxmNTV3gjk1LbhZkh9dVk7XJ6C7w=
+SIZE (moc-2.6-alpha1.tar.xz) = 491660
diff --git a/audio/moc/pkg/DESCR b/audio/moc/pkg/DESCR
index c6c28c77ae..1ea32d6805 100644
--- a/audio/moc/pkg/DESCR
+++ b/audio/moc/pkg/DESCR
@@ -1,8 +1,23 @@
 MOC (music on console) is a console audio player for LINUX/UNIX designed
 to be powerful and easy to use.
 
+You just need to select a file from some directory using the menu similar to
+Midnight Commander, and MOC will start playing all files in this directory
+beginning from the chosen file.  There is no need to create playlists as in
+other players.
+
+If you want to combine some files from one or more directories in one playlist,
+you can do this.  The playlist will be remembered between runs or you can save
+it as an m3u file to load it whenever you want.
+
+Need the console where MOC is running for more important things?  Need to close
+the X terminal emulator?  You don't have to stop playing - just press q and the
+interface will be detached leaving the server running.  You can attach it later,
+or you can attach one interface in the console, and another in the X terminal
+emulator, no need to switch just to play another file.
+
 MOC plays smoothly, regardless of system or I/O load because it uses the
-output buffer in a separate thread. It provides gapelss playback because
+output buffer in a separate thread. It provides gapless playback because
 the next file to be played is precached while the current file is
 playing.