diff --git a/pypo/install/pypo-install.py b/pypo/install/pypo-install.py
index 7634e1263..8cdef6cb7 100644
--- a/pypo/install/pypo-install.py
+++ b/pypo/install/pypo-install.py
@@ -12,6 +12,7 @@ import logging
 import logging.config
 import shutil
 import string
+import platform
 from subprocess import Popen, PIPE, STDOUT
 
 if os.geteuid() != 0:
@@ -68,6 +69,17 @@ try:
   print "Copying pypo files"
   shutil.copy("../scripts/silence-playlist.lsp", BASE_PATH+"files/basic")
   shutil.copy("../scripts/silence.mp3", BASE_PATH+"files/basic")
+  
+  if platform.architecture()[0] == '64bit':
+      print "Installing 64-bit liquidsoap binary"
+      shutil.copy("../liquidsoap/liquidsoap64", "../liquidsoap/liquidsoap")
+  elif platform.architecture()[0] == '32bit':
+      print "Installing 32-bit liquidsoap binary"
+      shutil.copy("../liquidsoap/liquidsoap32", "../liquidsoap/liquidsoap")
+  else:
+      print "Unknown system architecture."
+      sys.exit(1)
+  
   #shutil.copy("../pypo-cli.py", BASE_PATH+"bin")
   #shutil.copy("../pypo-notify.py", BASE_PATH+"bin")
   #shutil.copy("../logging.cfg", BASE_PATH+"bin")
diff --git a/pypo/liquidsoap/liquidsoap b/pypo/liquidsoap/liquidsoap32
similarity index 100%
rename from pypo/liquidsoap/liquidsoap
rename to pypo/liquidsoap/liquidsoap32
diff --git a/pypo/liquidsoap/liquidsoap64 b/pypo/liquidsoap/liquidsoap64
new file mode 100755
index 000000000..41ccb8c6b
Binary files /dev/null and b/pypo/liquidsoap/liquidsoap64 differ
diff --git a/pypo/pypo-cli.py b/pypo/pypo-cli.py
index 7c1b27de9..120ebb427 100755
--- a/pypo/pypo-cli.py
+++ b/pypo/pypo-cli.py
@@ -687,7 +687,6 @@ class Playout:
                     logger.debug(line.strip())
                     tn.write(self.export_source + '.push %s' % (line.strip()))
                     tn.write("\n")
-                    #time.sleep(0.1)
                 
             tn.write("exit\n")
             logger.debug(tn.read_all())
@@ -702,10 +701,6 @@ class Playout:
             logger.debug("Sending additional data to liquidsoap: "+liquidsoap_data)
             tn.write("vars.pypo_data "+liquidsoap_data+"\n")
                 
-#            if(int(ptype) < 5):
-#                tn.write(self.export_source + '.flip')
-#                tn.write("\n")
-
             tn.write(self.export_source + '.flip')
             tn.write("\n")