diff --git a/xtandempipeline/debian/changelog b/xtandempipeline/debian/changelog
index 0900b269888536bc28d36b0202ba3e79a2fd46a7..d477c19f48e85f2a82363009c3c7863044c29068 100644
--- a/xtandempipeline/debian/changelog
+++ b/xtandempipeline/debian/changelog
@@ -1,3 +1,9 @@
+xtandempipeline (3.1.1-2) natty; urgency=low
+
+  * test for 32 or 64 architecture to set maximum java heap memory
+
+ --  Olivier Langella <Olivier.Langella@moulon.inra.fr>  Sun, 8 May 2011 9:18:51 +0200
+
 xtandempipeline (3.1.1-1) natty; urgency=low
 
   * FDR computation are now compatible with reverse option of X!Tandem.
diff --git a/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake b/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake
index 705b9d75a05525baff976f9a70a6b028c24867da..062656f5643d7d6f37a2ff023a0581697df51124 100644
--- a/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake
+++ b/xtandempipeline/share/xtandempipeline/xtandempipeline.sh.cmake
@@ -1,3 +1,9 @@
 #!/bin/bash
 
-@CMAKE_Java_COMPILER@ -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar
+if [ $(uname -m) == "x86_64" ]; then
+	@CMAKE_Java_COMPILER@ -Xmx3000m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar
+else
+	@CMAKE_Java_COMPILER@ -Xmx1500m -Xms256m -jar @CMAKE_INSTALL_PREFIX@/share/xtandempipeline/XtandemPipeline.jar
+fi
+
+