diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..27cb45e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+bin/*
+*.swp
+*.swo
+mig-agent-conf.go
+doc/*.html
+*.a
+*.so
diff --git a/Makefile b/Makefile
index 26de2e5c..1a1cb007 100644
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ rpm-utils: mig-action-generator
 		--url https://github.com/mozilla/mig \
 		-s dir -t rpm .
 
-gpgme: 
+gpgme:
 	make -C $(GPGMEDIR)
 
 tests: mig-agent