diff --git a/mcelog-socket-path.patch b/mcelog-socket-path.patch
new file mode 100644
index 0000000..32145f5
--- /dev/null
+++ b/mcelog-socket-path.patch
@@ -0,0 +1,13 @@
+--- mcelog-1.0.1.orig/paths.h
++++ mcelog-1.0.1/paths.h
+@@ -4,8 +4,8 @@
+ #define DIMM_DB_FILENAME PREFIX "/var/lib/memory-errors"
+ #define CONFIG_FILENAME PREFIX "/etc/mcelog/mcelog.conf"
+ 
+-#define SOCKET_PATH "/var/run/mcelog-client"
++#define SOCKET_PATH "/run/mcelog/mcelog-client"
+ 
+ #define LOG_FILE "/var/log/mcelog"
+ 
+-#define PID_FILE "/var/run/mcelog.pid"
++#define PID_FILE "/run/mcelog/mcelog.pid"
diff --git a/mcelog.changes b/mcelog.changes
index cc64261..4672f91 100644
--- a/mcelog.changes
+++ b/mcelog.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Sep 20 03:16:05 UTC 2014 - crrodriguez@opensuse.org
+
+- mcelog.tmpfiles, mcelog-socket-path.patch, move socket
+  and pid file to /run/mcelog directory.
+  This update may require reboot as the relevant rpm macro
+  tmpfiles_create is not yet in any product.
+
 -------------------------------------------------------------------
 Wed Sep  3 15:41:05 UTC 2014 - trenn@suse.de
 
diff --git a/mcelog.spec b/mcelog.spec
index 3a31bd3..75529e3 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           mcelog
 Summary:        Log Machine Check Events
 License:        GPL-2.0
@@ -32,6 +31,7 @@ Source:         mcelog-%{version}.tar.bz2
 Source2:        mcelog.sysconfig
 Source3:        mcelog.systemd
 Source4:        90-mcelog.rules
+Source5:        mcelog.tmpfiles
 Source6:        README.email_setup
 Patch1:         email.patch
 Patch2:         mcelog_invert_prefill_db_warning.patch
@@ -44,6 +44,7 @@ Patch8:         patches/add-f14h-support.patch
 Patch9:         patches/add-f15h-support.patch
 Patch10:        patches/add-f16h-support.patch
 Patch11:        0001-Continue-without-dmi-when-no-SMBIOS-or-SMBIOS-0x0-in.patch
+Patch12:        mcelog-socket-path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %fillup_prereq
 Url:            https://git.kernel.org/cgit/utils/cpu/mce/mcelog.git
@@ -80,7 +81,7 @@ Authors:
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-
+%patch12 -p1
 %build
 export SUSE_ASNEEDED=0
 make CFLAGS="$RPM_OPT_FLAGS"
@@ -99,7 +100,8 @@ mkdir -p $RPM_BUILD_ROOT/%_docdir/%name
 install -m 644 %SOURCE6 $RPM_BUILD_ROOT/%_docdir/%name/README.email_setup
 install -m 644 lk10-mcelog.pdf $RPM_BUILD_ROOT/%_docdir/%name/lk10-mcelog.pdf
 install -D -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/mcelog.service
-install -D -m 0644 %SOURCE4  %{buildroot}%{_udevrulesdir}/90-mcelog.rules
+install -D -m 0644 %SOURCE4 %{buildroot}%{_udevrulesdir}/90-mcelog.rules
+install -D -m 0644 %SOURCE5 %{buildroot}%{_tmpfilesdir}/mcelog.conf
 ln -sf %_sbindir/service ${RPM_BUILD_ROOT}%_sbindir/rcmcelog
 
 %clean
@@ -110,7 +112,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %fillup_only
+%{?tmpfiles_create:%{tmpfiles_create}}
 %udev_rules_update
+
 %service_add_post %{name}.service
 
 %preun
@@ -130,6 +134,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/mcelog/*trigger
 %{_unitdir}/mcelog.service
 %{_udevrulesdir}/90-mcelog.rules
+%{_tmpfilesdir}/mcelog.conf
 %_docdir/%name
 %_sbindir/rcmcelog
 
diff --git a/mcelog.tmpfiles b/mcelog.tmpfiles
new file mode 100644
index 0000000..04e0554
--- /dev/null
+++ b/mcelog.tmpfiles
@@ -0,0 +1 @@
+d /run/mcelog 0755 root root -
\ No newline at end of file