diff --git a/.gitignore b/.gitignore
index 8b1b934563..dfa3bd0e62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,20 @@ GTAGS
 # uavcan firmware
 ROMFS/px4fmu_common/uavcan/
 vectorcontrol/
+
+
+# CLion ignores
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+# Sensitive or high-churn files:
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/dataSources.local.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 89c3b8c212..a9d82dae4c 100644
--- a/Makefile
+++ b/Makefile
@@ -279,7 +279,7 @@ submodulesclean:
 	@git submodule update --init --recursive --force
 
 distclean: submodulesclean clean
-	@git clean -ff -x -d -e ".project" -e ".cproject"
+	@git clean -ff -x -d -e ".project" -e ".cproject" -e ".idea"
 
 # All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
 %: