diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore
index 53cbacd0015bb93335b54713f14e69a2f9f8637e..49ef4bed2c3a654a6f1308629c8c02225c408554 100644
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@@ -15,6 +15,10 @@ cache/pdf/*
 cache/smarty/cache/*
 cache/smarty/templates_c/*
 cache/xml/*
+# Ignore some files and directories from the custom directory.
+custom/history/*
+custom/modulebuilder/*
+custom/working/*
 # Custom configuration should also be ignored.
 /config.php
 /config_override.php