diff --git a/makedist b/makedist
old mode 100644
new mode 100755
index 897818f..a50b073
--- a/makedist
+++ b/makedist
@@ -1,41 +1,41 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 if [ ! -f library/cdr_generic.php ]; then
     echo "Run this program inside the CDRTool directory"
     exit 1
 fi
 
 style=""
 pkgignore=".pkgignorelite"
 
 if [ $# -eq 1 -a "$1" = "full" ]; then
     style="_full"
     pkgignore=".pkgignore"
 fi
 
 dirname=`basename $PWD`
 basedir=`dirname  $PWD`
 
 version=`cat version`
 
 archive="CDRTool-$version$style.tar.gz"
 
 if [ "$dirname" != "CDRTool" ]; then
     create=1
 else
     create=0
 fi
 
 if [ $create -eq 1 ]; then
    (cd ../; ln -s "$dirname" CDRTool)
 fi
 
 echo "Creating $archive"
 
 GZIP=--best
 tar --exclude-from=$pkgignore --directory ../ -zchf "$archive" CDRTool
 
 if [ $create -eq 1 ]; then
    rm ../CDRTool
 fi
 
diff --git a/po/merge.sh b/po/merge.sh
old mode 100644
new mode 100755
index 0850448..9de1e0e
--- a/po/merge.sh
+++ b/po/merge.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
 make cdrtool.pot
 msgmerge ro.po cdrtool.pot > ronew.po; mv ronew.po ro.po
 msgmerge nl.po cdrtool.pot > nlnew.po; mv nlnew.po nl.po
 msgmerge de.po cdrtool.pot > denew.po; mv denew.po de.po
 msgmerge es.po cdrtool.pot > esnew.po; mv esnew.po es.po
diff --git a/setup/fixPermissions.sh b/setup/fixPermissions.sh
old mode 100644
new mode 100755
index 4926c8b..7292eeb
--- a/setup/fixPermissions.sh
+++ b/setup/fixPermissions.sh
@@ -1,2 +1,2 @@
-#!/bin/sh
+#!/usr/bin/env sh
 find ../ -name \*.php -exec chmod +x {} \;
diff --git a/setup/mysql/setup_mysql.sh b/setup/mysql/setup_mysql.sh
old mode 100644
new mode 100755
index e372530..cd534d8
--- a/setup/mysql/setup_mysql.sh
+++ b/setup/mysql/setup_mysql.sh
@@ -1,35 +1,35 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 db=cdrtool
 
 if test $# != 2; then
 	echo "setup_mysql.sh DB_ROOT_PASSWORD DB_HOST"
 	exit;
 fi
 
 grep \'PASSWORD\' create_users.mysql | grep -i grant > /dev/null
 
 if test $? = 0  ; then
     echo "Please edit create_users.mysql and replace the PASSWORD with a new password and try again"
     exit 1
 fi
 
 grep \'PRIVATE_IP_NETWORK\' create_users.mysql | grep -i grant > /dev/null
 
 if test $? = 0  ; then
     echo "Please edit create_users.mysql and replace the PRIVATE_IP_NETWORK with real addresses and try again"
     exit 1
 fi
 
 mysqladmin 	-u root -p$1 -h $2 create $db
 
 if test $? = 0  ; then
 	mysql 		-u root -p$1 -h $2 mysql < ./create_users.mysql
 	mysql 		-u root -p$1 -h $2 $db   < ./create_tables.mysql
 	mysql 		-u root -p$1 -h $2 $db   < ./create_data.mysql
 else 
 	echo "Failed to create $db database on host $2"
 	exit 1
 fi
 
 exit 0
diff --git a/setup/radius/CISCO/radacct-patch.sh b/setup/radius/CISCO/radacct-patch.sh
old mode 100644
new mode 100755
index a4a6a8f..c274aea
--- a/setup/radius/CISCO/radacct-patch.sh
+++ b/setup/radius/CISCO/radacct-patch.sh
@@ -1,52 +1,52 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 if [ $# -ge 1 ]; then
    radacct=$1
 else
    radacct='radacct'
 fi
 
 echo -n "Please type in MySQL root password (^C to abort): "
 
 read rootpass
 
 echo "Patching table $radacct..."
 
 mysql -u root -p$rootpass radius << EOF
 
 # Fields required for H323 Vendor Attributes
 alter table $radacct add column H323GWID VARCHAR(32) DEFAULT '' NOT NULL;
 alter table $radacct add column H323CallOrigin VARCHAR(10) DEFAULT '' NOT NULL;
 alter table $radacct add column H323CallType VARCHAR(64) DEFAULT '' NOT NULL;
 alter table $radacct add column H323SetupTime timestamp NOT NULL;
 alter table $radacct add column H323ConnectTime timestamp NOT NULL;
 alter table $radacct add column H323DisconnectTime timestamp NOT NULL;
 alter table $radacct add column H323DisconnectCause varchar(2) DEFAULT '' NOT NULL;
 alter table $radacct add column H323RemoteAddress varchar(255) NOT NULL;
 alter table $radacct add column H323VoiceQuality NUMERIC(2);
 alter table $radacct add column H323ConfID VARCHAR(255) DEFAULT '' NOT NULL;
 alter table $radacct add column CiscoNASPort varchar(255) not null after NASIPAddress;
 
 # Fields required for normalization
 alter table $radacct add column Timestamp bigint(20) unsigned not null;
 alter table $radacct add column DestinationId varchar(255) not null;
 alter table $radacct add column Price double(20, 4);
 alter table $radacct add column Rate text not null;
 alter table $radacct add Normalized enum('0','1') default '0';
 
 # Enlarge some small columns
 alter table $radacct change column AcctSessionId AcctSessionId varchar(255) not null;
 alter table $radacct change column NASPortType NASPortType varchar(255) not null;
 alter table $radacct change column NASPortId NASPortId varchar(50) not null;
 alter table $radacct change column AcctUniqueId AcctUniqueId varchar(255) not null;
 alter table $radacct change column H323DisconnectCause H323DisconnectCause varchar(255) not null;
 alter table $radacct change column H323CallOrigin H323CallOrigin varchar(128) not null;
 alter table $radacct change column H323ConfID H323ConfID varchar(128) not null;
 
 alter table radacct add index caller_idx (CallingStationId);
 alter table radacct add index called_idx (CalledStationId);
 alter table radacct add index Normalized_idx (Normalized);
 
 EOF
 
 echo "done"
diff --git a/setup/radius/OpenSIPS/radacct-patch.sh b/setup/radius/OpenSIPS/radacct-patch.sh
old mode 100644
new mode 100755
index 2732516..218d17b
--- a/setup/radius/OpenSIPS/radacct-patch.sh
+++ b/setup/radius/OpenSIPS/radacct-patch.sh
@@ -1,67 +1,67 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 if [ $# -ge 1 ]; then
    radacct=$1
 else
    radacct='radacct'
 fi
 
 echo -n "Please type in MySQL root password (^C to abort): "
 
 read rootpass
 
 echo "Patching table $radacct..."
 
 mysql -u root -p$rootpass radius << EOF
 
 # Fields required for SIP support 
 alter table $radacct add column SipMethod varchar(50) not null;
 alter table $radacct add column SipResponseCode smallint unsigned not null;
 alter table $radacct add column SipToTag varchar(128) not null;
 alter table $radacct add column SipFromTag varchar(128) not null;
 alter table $radacct add column SipTranslatedRequestURI varchar(255) NOT NULL;
 alter table $radacct add column SipUserAgents varchar(128) NOT NULL;
 alter table $radacct add column SipApplicationType varchar(64) NOT NULL;
 alter table $radacct add column SipCodecs varchar(255) NOT NULL;
 alter table $radacct add column SipRPID varchar(25) not null;
 alter table $radacct add column SipRPIDHeader varchar(25) not null;
 alter table $radacct add column SourceIP varchar(64) not null;
 alter table $radacct add column SourcePort varchar(5) not null;
 alter table $radacct add column CanonicalURI varchar(255) not null;
 alter table $radacct add column DelayTime varchar(5) not null;
 
 # Fields required for normalization
 alter table $radacct add column Timestamp bigint(20) unsigned not null;
 alter table $radacct add column DestinationId varchar(255) not null;
 alter table $radacct add column Rate text not null;
 alter table $radacct add column Price double(20,4)  not null;
 alter table $radacct add Normalized enum('0','1') default '0';
 alter table $radacct add BillingId varchar(255) NOT NULL default '';
 alter table $radacct add column MediaInfo varchar(32) default NULL;
 alter table $radacct add column RTPStatistics text not null;
 alter table $radacct add column FromHeader varchar(128) not null; 
 alter table $radacct add column UserAgent varchar(128) not null; 
 alter table $radacct add column Contact varchar(128) not null;
 
 # Enlarge some small columns
 alter table $radacct change column AcctSessionId AcctSessionId varchar(255) not null;
 alter table $radacct change column NASPortType NASPortType varchar(255) not null;
 alter table $radacct change column NASPortId NASPortId varchar(50) not null;
 alter table $radacct change column AcctUniqueId AcctUniqueId varchar(255) not null;
 alter table $radacct change column FramedProtocol ENUMtld varchar(64) not null;
 
 alter table $radacct add unique sess_id(AcctSessionId(128),SipFromTag,SipToTag) ;
 
 alter table $radacct add index caller_idx (CallingStationId);
 alter table $radacct add index called_idx (CalledStationId);
 alter table $radacct add index canon_idx  (CanonicalURI);
 alter table $radacct add index normalize_idx(Normalized);
 alter table $radacct add index source_ip_idx (SourceIP);
 alter table $radacct add index billing_id_idx (BillingId);
 alter table $radacct add index dest_id_idx (DestinationId);
 alter table $radacct add index MediaInfo_idx(MediaInfo);
 alter table $radacct add index Realm_idx(Realm);
 
 EOF
 
 echo "done"