diff --git a/OMXControl.h b/OMXControl.h
index 91395bf1..26d58675 100644
--- a/OMXControl.h
+++ b/OMXControl.h
@@ -2,6 +2,9 @@
 #define OMXPLAYER_DBUS_INTERFACE_ROOT "org.mpris.MediaPlayer2"
 #define OMXPLAYER_DBUS_INTERFACE_PLAYER "org.mpris.MediaPlayer2.Player"
 
+#define OMXPLAYER_DBUS_ADDRESS_FRMT           "/tmp/omxplayerdbus.%s"
+#define OMXPLAYER_DBUS_PID_FRMT               "/tmp/omxplayerdbus.%s.pid"
+
 #include <dbus/dbus.h>
 #include "OMXClock.h"
 #include "OMXPlayerAudio.h"
diff --git a/dbuscontrol.sh b/dbuscontrol.sh
index 7fd71647..c45c3b6a 100755
--- a/dbuscontrol.sh
+++ b/dbuscontrol.sh
@@ -43,6 +43,8 @@ pause)
 
 stop)
 	dbus-send --print-reply=literal --session --dest=org.mpris.MediaPlayer2.omxplayer /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Action int32:15 >/dev/null
+	rm -fr $OMXPLAYER_DBUS_ADDR
+	rm -fr $OMXPLAYER_DBUS_PID
 	;;
 
 seek)
diff --git a/omxplayer.cpp b/omxplayer.cpp
index bde45363..8b4a9b2e 100644
--- a/omxplayer.cpp
+++ b/omxplayer.cpp
@@ -26,6 +26,8 @@
 #include <sys/ioctl.h>
 #include <getopt.h>
 #include <string.h>
+#include <pwd.h>
+#include <unistd.h>
 
 #define AV_NOWARN_DEPRECATED
 
@@ -1828,6 +1830,24 @@ int main(int argc, char *argv[])
   {
     unsigned t = (unsigned)(m_av_clock->OMXMediaTime()*1e-6);
     printf("Stopped at: %02d:%02d:%02d\n", (t/3600), (t/60)%60, t%60);
+	register struct passwd *pw;
+	register uid_t uid;
+	int c;
+	char sDBusAddr[STD_BUF_SIZE];
+	char sDBusPid[STD_BUF_SIZE];
+	uid = geteuid ();
+	pw = getpwuid (uid);
+	if (pw)
+	{
+	  snprintf(sDBusAddr, STD_BUF_SIZE-1, OMXPLAYER_DBUS_ADDRESS_FRMT, pw->pw_name);
+	  snprintf(sDBusPid, STD_BUF_SIZE-1, OMXPLAYER_DBUS_PID_FRMT, pw->pw_name);
+	}else
+	{
+	  snprintf(sDBusAddr, STD_BUF_SIZE-1, OMXPLAYER_DBUS_ADDRESS_FRMT, "root");
+	  snprintf(sDBusPid, STD_BUF_SIZE-1, OMXPLAYER_DBUS_PID_FRMT, "root");
+	}
+	unlink(sDBusAddr);
+	unlink(sDBusPid);
   }
 
   if (m_NativeDeinterlace)
@@ -1879,3 +1899,4 @@ int main(int argc, char *argv[])
   // exit status failure on other cases
   return EXIT_FAILURE;
 }
+