diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index 4c2ab7f..aec44a5 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -41,7 +41,14 @@ hc emit_hook reload
 ## Background image:
 
 # Set a random image as the desktop wallpaper.
-feh --bg-tile $(random-wallpaper)
+wallpaper=$(random-wallpaper)
+
+if ! hc attr my_wallpaper
+then
+    hc new_attr string my_wallpaper
+fi
+
+feh --bg-tile "$wallpaper" && hc set_attr my_wallpaper "$wallpaper"
 
 ## Keybindings:
 # Remove all existing keybindings so that when herbstluftwm is