diff --git a/.gitignore b/.gitignore
index 3b23a7cd6d..5fdaa6d3dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,9 @@ Makefile.*
 *.user.*
 *.o
 moc_*.cpp
-ui_*.h
 moc_predefs.h
+/ui/
+ui_*.h
 .qm/
 *.qm
 qmake_qmake_qm_files.qrc
diff --git a/Jamulus.pro b/Jamulus.pro
index 1465acab81..85cb7ba106 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -380,6 +380,16 @@ win32 {
 # It doesn't work with multiple targets or architectures.
 RESOURCES += src/resources.qrc
 
+# store ui_*.h files in a directory instead of project root
+UI_DIR = ui
+
+# A tree built in place before UI_DIR was set still has ui_*.h in its root, and
+# they must be deleted before creating the new Makefiles.
+STALE_UI_HEADERS = $$files(ui_*.h)
+for (stale, STALE_UI_HEADERS) {
+    system($$QMAKE_DEL_FILE $$stale)
+}
+
 FORMS_GUI = src/aboutdlgbase.ui \
     src/serverdlgbase.ui
 
@@ -1213,9 +1223,9 @@ android {
     for (abi, ANDROID_ABIS) {
         DISTCLEAN_DIRS += debug-$${abi} release-$${abi}
     }
-    DISTCLEAN_DIRS += .qm
+    DISTCLEAN_DIRS += $$UI_DIR .qm
 } else {
-    DISTCLEAN_DIRS += debug release .qm
+    DISTCLEAN_DIRS += debug release $$UI_DIR .qm
 }
 
 win32 {