diff --git a/.gitignore b/.gitignore
index ae7c1868a4b1d69f57db48e6783928a483cb962e..66b05ba2eeb487e3cfdc297d3d00a320504bd364 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,24 @@
+# File extensions
 *~
-*.sw?
-ROOTfiles
-ROOTfiles/*
-ROOTfiles.old/*
-bck/*
-#*
-*#*
-hcana
-raw
-cache
-.root_history
-HISTOGRAMS/*
-REPORT_OUTPUT
-REPORT_OUTPUT/*
-log/*
-onlineGUI/Config/kpp_*
+*#*#*
 *.d
 *.so
-*Auto*
-CALIBRATION/shms_cal_calib/pcal.param*
-CALIBRATION/hms_cal_calib/hcal.param*
-CALIBRATION/shms_cal_calib/calibrated.deb
-CALIBRATION/hms_cal_calib/calibrated.deb
-CALIBRATION/hms_cal_calib/hcal_calib_cpp_ACLiC_dict_rdict.pcm
-CALIBRATION/shms_cal_calib/pcal_calib_cpp_ACLiC_dict_rdict.pcm
-CALIBRATION/*/data_files/*		
-CALIBRATION/*/root_files/*
-CALIBRATION/shms_dc_calib/data_files/
-onlineGUI/onlineGUI_v1.2.1/onlineDict_rdict.pcm
+*.pcm
+*.png
+*.ps
+*.eps
+*.pdf
 .nfs*
-raw.copiedtotape
+
+# Directories
+REPORT_OUTPUT
 HISTOGRAMS
-*.png
-*.ps
\ No newline at end of file
+MON_OUTPUT
+ROOTfiles
+.root_history
+raw
+raw.copiedtotape
+cache
+
+# Symbolic links
+hcana
\ No newline at end of file