diff -Nru bitpim-0.9.08.orig/src/bp.py bitpim-0.9.08/src/bp.py
--- bitpim-0.9.08.orig/src/bp.py	2006-09-04 05:24:41.000000000 +0300
+++ bitpim-0.9.08/src/bp.py	2006-12-02 16:13:01.552641919 +0200
@@ -49,7 +49,7 @@
     if sys.platform=="darwin" and len(sys.argv)>1 and sys.argv[1].startswith("-psn_"):
 	# get rid of the process serial number on mac
 	sys.argv=sys.argv[:1]+sys.argv[2:]
-    _options, _args=getopt.getopt(sys.argv[1:], 'c:d:')
+    _options, _args=getopt.gnu_getopt(sys.argv[1:], 'c:d:')
     _kwargs={}
     # check for debug flag
     _debug=__debug__ or bool(_args and 'debug' in _args)
diff -Nru bitpim-0.9.08.orig/src/common.py bitpim-0.9.08/src/common.py
--- bitpim-0.9.08.orig/src/common.py	2006-08-27 01:44:28.000000000 +0300
+++ bitpim-0.9.08/src/common.py	2006-12-02 16:13:01.552641919 +0200
@@ -854,4 +854,4 @@
         # windows running from exe, return as is
         return os.path.abspath(os.path.dirname(sys.executable))
     # running from src, up one
-    return os.path.split(os.path.abspath(os.path.dirname(sys.argv[0])))[0]
+    return os.path.abspath(os.path.dirname(sys.argv[0]))
diff -Nru bitpim-0.9.08.orig/src/conversions.py bitpim-0.9.08/src/conversions.py
--- bitpim-0.9.08.orig/src/conversions.py	2006-05-28 06:10:52.000000000 +0300
+++ bitpim-0.9.08/src/conversions.py	2006-12-02 16:13:01.552641919 +0200
@@ -20,11 +20,11 @@
 
 class ConversionFailed(Exception): pass
 
-helperdir=os.path.join(common.get_main_dir(), "helpers")
+helperdir="/usr/bin"
 
 osext={'win32': '.exe',
        'darwin': '.mbin',
-       'linux2': '.lbin'} \
+       'linux2': ''} \
        [sys.platform]
 
 # This shortname crap is needed because Windows programs (including ffmpeg)
@@ -125,14 +125,14 @@
     p=sys.path[0]
     if os.path.isfile(p):
         p=os.path.dirname(p)
-    helpersdirectory=os.path.abspath(os.path.join(p, 'helpers'))
+    helpersdirectory="/usr/bin"
     print "Helper Directory: "+helpersdirectory
     if sys.platform=='win32':
         osext=".exe"
     if sys.platform=='darwin':
         osext=".mbin"
     if sys.platform=='linux2':
-        osext=".lbin"
+        osext=""
         
     pngtopnmbin=gethelperbinary('pngtopnm')
     ppmquantbin=gethelperbinary('ppmquant')
diff -Nru bitpim-0.9.08.orig/src/native/av/bmp2avi/Makefile bitpim-0.9.08/src/native/av/bmp2avi/Makefile
--- bitpim-0.9.08.orig/src/native/av/bmp2avi/Makefile	2006-05-05 10:10:08.000000000 +0300
+++ bitpim-0.9.08/src/native/av/bmp2avi/Makefile	2006-12-02 16:13:01.552641919 +0200
@@ -13,6 +13,6 @@
 
 SRC=avi_file.cxx bmp_file.cxx b2a.cxx
 
-bmp2avi.lbin bmp2avi.mbin bmp2avi.exe: $(SRC)
+bmp2avi bmp2avi.mbin bmp2avi.exe: $(SRC)
 	$(CXX) $(EXTRADEFINES) -O2 -o $@ $(SRC)
 
diff -Nru bitpim-0.9.08.orig/src/native/usb/build.sh bitpim-0.9.08/src/native/usb/build.sh
--- bitpim-0.9.08.orig/src/native/usb/build.sh	2006-03-04 06:57:24.000000000 +0200
+++ bitpim-0.9.08/src/native/usb/build.sh	2006-12-02 16:13:01.556642169 +0200
@@ -4,4 +4,4 @@
 swig -python -I/usr/include libusb.i
 
 gcc -fPIC -Wall -fno-strict-aliasing -O2 -g  -shared  -I $INCLUDEDIR -o _libusb.so libusb_wrap.c -lusb 
-strip _libusb.so
+#strip _libusb.so