diff --git a/MOVED b/MOVED
index e3f007a59aa4..2dea1595c68b 100644
--- a/MOVED
+++ b/MOVED
@@ -7928,7 +7928,6 @@ graphics/pure-gl||2015-11-28|Has expired: Broken for more than 6 months
 audio/dvda-author||2015-11-28|Has expired: Broken for more than 6 months
 chinese/oxim||2015-11-28|Has expired: Broken for more than 6 months
 editors/spe||2015-11-28|Has expired: Broken for more than 6 months
-audio/mpdscribble||2015-11-28|Has expired: Broken for more than 6 months
 cad/geda-symcheck||2015-11-28|Has expired: Broken for more than 6 months
 audio/linux-fmodapi||2015-11-28|Has expired: Broken for more than 6 months
 audio/pure-audio||2015-11-28|Has expired: Broken for more than 6 months
diff --git a/audio/mpdscribble/Makefile b/audio/mpdscribble/Makefile
new file mode 100644
index 000000000000..b25070c958c3
--- /dev/null
+++ b/audio/mpdscribble/Makefile
@@ -0,0 +1,40 @@
+# Created by: Stepan Zastupov [RedChrom] <redchrom@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	mpdscribble
+PORTVERSION=	0.22
+PORTREVISION=	1
+CATEGORIES=	audio
+MASTER_SITES=	http://www.musicpd.org/download/${PORTNAME}/${PORTVERSION}/
+
+MAINTAINER=	freebsdbugs@tungol.org
+COMMENT=	Musicpd last.fm client
+
+LICENSE=	GPLv2
+
+LIB_DEPENDS+=	libmpdclient.so:audio/libmpdclient
+
+USES=		pkgconfig tar:bzip2
+USE_GNOME=	glib20
+GNU_CONFIGURE=	yes
+USE_RC_SUBR=	mpdscribble
+
+OPTIONS_DEFINE=	SOUP DOCS
+SOUP_DESC=	Use libsoup instead of libcurl
+
+SOUP_LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+SOUP_CONFIGURE_ON=	--with-http-client=soup
+SOUP_LIB_DEPENDS_OFF=	libcurl.so:ftp/curl
+SOUP_CONFIGURE_OFF=	--with-http-client=curl
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/src/mpdscribble ${STAGEDIR}${PREFIX}/bin/mpdscribble
+	${INSTALL_MAN} ${WRKSRC}/doc/mpdscribble.1 ${STAGEDIR}${MANPREFIX}/man/man1/mpdscribble.1
+	${INSTALL_DATA} ${WRKSRC}/doc/mpdscribble.conf ${STAGEDIR}${PREFIX}/etc/mpdscribble.conf.sample
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for file in AUTHORS NEWS README
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/audio/mpdscribble/distinfo b/audio/mpdscribble/distinfo
new file mode 100644
index 000000000000..0ec6694c7f69
--- /dev/null
+++ b/audio/mpdscribble/distinfo
@@ -0,0 +1,2 @@
+SHA256 (mpdscribble-0.22.tar.bz2) = 1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41
+SIZE (mpdscribble-0.22.tar.bz2) = 116981
diff --git a/audio/mpdscribble/files/mpdscribble.in b/audio/mpdscribble/files/mpdscribble.in
new file mode 100644
index 000000000000..d7e62fb4ed53
--- /dev/null
+++ b/audio/mpdscribble/files/mpdscribble.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+
+# PROVIDE: mpdscribble
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following line to /etc/rc.conf to enable mpdscribble:
+#
+#mpdscribble_enable="YES"
+
+. /etc/rc.subr
+
+name=mpdscribble
+rcvar=mpdscribble_enable
+
+command=%%PREFIX%%/bin/mpdscribble
+
+load_rc_config $name
+
+: ${mpdscribble_enable="NO"}
+: ${mpdscribble_user="nobody"}
+
+command_args="--daemon-user ${mpdscribble_user}"
+
+run_rc_command "$1"
diff --git a/audio/mpdscribble/pkg-descr b/audio/mpdscribble/pkg-descr
new file mode 100644
index 000000000000..9bcdc1c6db46
--- /dev/null
+++ b/audio/mpdscribble/pkg-descr
@@ -0,0 +1,4 @@
+mpdscribble is a music player daemon client which submits information about
+tracks being played to Last.fm (formerly audioscrobbler).
+
+WWW: http://mpd.wikia.com/wiki/Client:Mpdscribble
diff --git a/audio/mpdscribble/pkg-plist b/audio/mpdscribble/pkg-plist
new file mode 100644
index 000000000000..85a41e7a16ad
--- /dev/null
+++ b/audio/mpdscribble/pkg-plist
@@ -0,0 +1,6 @@
+bin/mpdscribble
+@sample etc/mpdscribble.conf.sample
+man/man1/mpdscribble.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS