diff --git a/applications/jpip/CHANGES b/applications/jpip/CHANGES
index ac6ac7c7..fef2748c 100644
--- a/applications/jpip/CHANGES
+++ b/applications/jpip/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPIP
 ! : changed
 + : added
 
+May 26, 2011
+! [antonin] changed Makefile to Makefile.nix to avoid having autotools overwrite them.
+
 May 23, 2011
 + [antonin] added autotools for the 'tools' directory
 + [antonin] added autotools as a build method for jpip (credit to Vincent Torri)
diff --git a/applications/jpip/Makefile b/applications/jpip/Makefile.nix
similarity index 100%
rename from applications/jpip/Makefile
rename to applications/jpip/Makefile.nix
diff --git a/applications/jpip/libopenjpip/Makefile b/applications/jpip/libopenjpip/Makefile.nix
similarity index 100%
rename from applications/jpip/libopenjpip/Makefile
rename to applications/jpip/libopenjpip/Makefile.nix
diff --git a/applications/jpip/opj_client/opj_dec_server/Makefile b/applications/jpip/opj_client/opj_dec_server/Makefile.nix
similarity index 100%
rename from applications/jpip/opj_client/opj_dec_server/Makefile
rename to applications/jpip/opj_client/opj_dec_server/Makefile.nix
diff --git a/applications/jpip/opj_server/Makefile b/applications/jpip/opj_server/Makefile.nix
similarity index 100%
rename from applications/jpip/opj_server/Makefile
rename to applications/jpip/opj_server/Makefile.nix
diff --git a/applications/jpip/tools/Makefile b/applications/jpip/tools/Makefile.nix
similarity index 100%
rename from applications/jpip/tools/Makefile
rename to applications/jpip/tools/Makefile.nix
diff --git a/applications/jpip/tools/indexer/Makefile b/applications/jpip/tools/indexer/Makefile.nix
similarity index 100%
rename from applications/jpip/tools/indexer/Makefile
rename to applications/jpip/tools/indexer/Makefile.nix