diff --git a/branding.spec b/branding.spec
index 527cf09..ad34c19 100644
--- a/branding.spec
+++ b/branding.spec
@@ -303,10 +303,10 @@ install slideshow/*  %buildroot/usr/share/install2/slideshow/
 pushd indexhtml
 mkdir -p %buildroot{%_indexhtmldir/,%_desktopdir/}
 cp -r * %buildroot%_indexhtmldir/
-rm -f %buildroot%_indexhtmldir/*.in
+rm -f %buildroot%_indexhtmldir/*.in %buildroot%_indexhtmldir/indexhtml.desktop
 touch %buildroot%_indexhtmldir/index.html
-popd
 install -m644 indexhtml.desktop %buildroot%_desktopdir/
+popd
 
 #bootloader
 %pre bootloader
diff --git a/indexhtml.desktop.in b/indexhtml/indexhtml.desktop.in
similarity index 100%
rename from indexhtml.desktop.in
rename to indexhtml/indexhtml.desktop.in