diff --git a/macros.initrd b/macros.initrd
index a5a5ffa..2242b9b 100644
--- a/macros.initrd
+++ b/macros.initrd
@@ -4,8 +4,8 @@
 # See also fate#313506
 
 %regenerate_initrd_post \
-	mkdir -p /var/run/regenerate-initrd/ \
-	touch /var/run/regenerate-initrd/all \
+	mkdir -p /run/regenerate-initrd/ \
+	touch /run/regenerate-initrd/all \
 	%nil
 
 %regenerate_initrd_posttrans \
diff --git a/regenerate-initrd-posttrans b/regenerate-initrd-posttrans
index 567740f..c1c9cac 100644
--- a/regenerate-initrd-posttrans
+++ b/regenerate-initrd-posttrans
@@ -2,18 +2,18 @@
 #
 # Packages that install kernels or kernel-modules create a flag
 #
-#   /var/run/regenerate-initrd/<kernel image>
+#   /run/regenerate-initrd/<kernel image>
 # 
 # to have the initrd for <kernel image> generated, or
 #
-#   /var/run/regenerate-initrd/all
+#   /run/regenerate-initrd/all
 #
 # to have all initrds generated. This script is called from posttrans
 # and takes care of generating the initrds
 
 shopt -s nullglob
 
-dir=/var/run/regenerate-initrd
+dir=/run/regenerate-initrd
 
 did_mkinitrd_setup=false
 run_mkinitrd_setup()
diff --git a/suse-module-tools.changes b/suse-module-tools.changes
index 99e4cfe..22317aa 100644
--- a/suse-module-tools.changes
+++ b/suse-module-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Sep  8 12:44:33 UTC 2015 - trenn@suse.de
+
+- Use /run instead of deprecated /var/run
+  This can have sever consequences if this package uses /var/run. It may
+  be installed before filesystem package generating the /run tmpfs and
+  predict it to generate the link /var/run -> /run. Later dracut convertfs
+  kicks in to generate it, but it has issues. bsc#922676
+
 -------------------------------------------------------------------
 Thu Aug 13 13:30:17 UTC 2015 - mmarek@suse.cz
 
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
index 2b30226..af86dff 100644
--- a/suse-module-tools.spec
+++ b/suse-module-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package suse-module-tools
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/weak-modules2 b/weak-modules2
index 8e9bb35..a76514c 100644
--- a/weak-modules2
+++ b/weak-modules2
@@ -357,8 +357,8 @@ run_depmod_and_mkinitrd() {
 	done
 	if [ -n "$image" ]; then
 	    if test -n "$INITRD_IN_POSTTRANS"; then
-		mkdir -p /var/run/regenerate-initrd
-		touch /var/run/regenerate-initrd/$image-$krel
+		mkdir -p /run/regenerate-initrd
+		touch /run/regenerate-initrd/$image-$krel
 	    else
 		doit /sbin/mkinitrd -k /boot/$image-$krel -i /boot/initrd-$krel
 		status=$?