diff --git a/.gitignore b/.gitignore
index cefd6d17..c7d403c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 # ignore the build directories
 code/apps/Managed Software Center/build/
 code/apps/MunkiStatus/build/
+code/apps/munkishim/build/
 
 # ignore any pkgs build by tool scripts
 munkitools*.pkg
diff --git a/code/apps/munkishim/.gitignore b/code/apps/munkishim/.gitignore
new file mode 100644
index 00000000..56d3ccbf
--- /dev/null
+++ b/code/apps/munkishim/.gitignore
@@ -0,0 +1,12 @@
+# .DS_Store files!
+.DS_Store
+
+# Xcode user data
+*.xcodeproj/project.xcworkspace/
+*.xcodeproj/xcuserdata/
+
+# ignore the MainMenu.xib for most localizations; it is generated at build time
+**/*.lproj/MainMenu.xib
+# but not the Base one!
+!**/Base.lproj/MainMenu.xib
+