diff --git a/CREDITS b/CREDITS
index ddab9b2fe5..4460827045 100644
--- a/CREDITS
+++ b/CREDITS
@@ -184,8 +184,8 @@ Ruby
 PHP
 <http://www.php.net/>
 
-    Virtuoso may be linked against libphp4.so or libphp5.so to provide a
-    PHP hosting environment.
+    Virtuoso may be linked against libphp5.so to provide a PHP hosting
+    environment.
 
     PHP is distributed under the terms of the PHP License:
     <http://php.net/license/>
diff --git a/README.WINDOWS b/README.WINDOWS
index 65c5c8aa2e..e99fe7c5cb 100644
--- a/README.WINDOWS
+++ b/README.WINDOWS
@@ -116,7 +116,6 @@ Optional components
   * virtodbc - Virtuoso ODBC Driver
   * virtuoso_clr_t - .NET CLR-hosting server (requires .NET Framework SDK v1.1)
   * virtuoso_javavm_t - Java hosting server (requires Java SDK)
-  * virtuoso_php_t - PHP4 hosting server (requires PHP4 library)
   * virtuoso_sample_t - sample of the Virtuoso server with extensions
   * hosting_perl - Perl hosting plugin (requires Active Perl)
   * hosting_python - Python hosting plugin (requires Active Python)
@@ -135,11 +134,11 @@ Building Virtuoso Open Source with Microsoft Visual Studio 2003
 Building optional components
 ----------------------------
 
-PHP4 library notes
+PHP5 library notes
 ------------------
 
-The following directories with the header files from the PHP4 source tree need
-to be placed under /win32/php4/ :
+The following directories with the header files from the PHP5 source tree need
+to be placed under /win32/php5/ :
 
   * ext/
   * main/
@@ -148,11 +147,6 @@ to be placed under /win32/php4/ :
   * win32/
   * Zend/
 
-In the same directory (/win32/php4) you should also copy the following:
-
-  * php4ts.dll
-  * php4ts.lib
-  * php_version.h
 
 Building the Virtuoso Open-Source Java hosting binary under Visual Studio 2003
 ------------------------------------------------------------------------------
diff --git a/appsrc/ODS-Calendar/make_vad.sh b/appsrc/ODS-Calendar/make_vad.sh
index 791bfeaab1..45712ac6fe 100755
--- a/appsrc/ODS-Calendar/make_vad.sh
+++ b/appsrc/ODS-Calendar/make_vad.sh
@@ -28,7 +28,7 @@ export LANG LC_ALL
 
 MODE=$1
 LOGDIR=`pwd`
-VERSION="1.6.46"
+VERSION="1.6.47"
 LOGFILE="${LOGDIR}/vad_make.log"
 STICKER_DAV="vad_dav.xml"
 STICKER_FS="vad_filesystem.xml"
diff --git a/appsrc/ODS-Calendar/www/css/style.css b/appsrc/ODS-Calendar/www/css/style.css
index 7d5a4e49d6..1f19c6dbae 100644
--- a/appsrc/ODS-Calendar/www/css/style.css
+++ b/appsrc/ODS-Calendar/www/css/style.css
@@ -1324,7 +1324,8 @@ span.toolbarLabel
   position: relative;
   width: 100%;
 }
-.chip * {
+.chip * 
+{
   -moz-user-select:none;
 }
 
diff --git a/appsrc/ODS-Calendar/www/home.vspx b/appsrc/ODS-Calendar/www/home.vspx
index 0cafc7f942..62bc2b3d9e 100644
--- a/appsrc/ODS-Calendar/www/home.vspx
+++ b/appsrc/ODS-Calendar/www/home.vspx
@@ -1602,16 +1602,25 @@
                   <v:select-list name="tvf_status" xhtml_id="tvf_status" xhtml_onchange="javascript: this.form.submit();">
                     <v:on-init>
                       <![CDATA[
-                        declare x any;
+                              declare x, y any;
 
-                        x := make_array (6, 'any');
+                              x := make_array (7, 'any');
                         x[0] := 'All';
-                        x[1] := 'Not Started';
-                        x[2] := 'In Progress';
-                        x[3] := 'Completed';
-                        x[4] := 'Waiting.';
-                        x[5] := 'Deferred';
-                        control.vsl_item_values := x;
+                              x[1] := 'Completed';
+                              x[2] := 'Not Completed';
+                              x[3] := '~ Not Started';
+                              x[4] := '~ In Progress';
+                              x[5] := '~ Waiting';
+                              x[6] := '~ Deferred';
+                              y := make_array (7, 'any');
+                              y[0] := 'All';
+                              y[1] := 'Completed';
+                              y[2] := 'Not Completed';
+                              y[3] := 'Not Started';
+                              y[4] := 'In Progress';
+                              y[5] := 'Waiting';
+                              y[6] := 'Deferred';
+                              control.vsl_item_values := y;
                         control.vsl_items := x;
                         control.ufl_value := '';
                       ]]>
@@ -1894,7 +1903,14 @@
                                                        self.cPrivacy
                                                       );
                             if (self.tv_status <> 'All')
+                            {
+                              if (self.tv_status = 'Not Completed')     
+                              {
+                                control.ds_sql := control.ds_sql || ' and a.E_STATUS <> \'Completed\'';
+                              } else {
                               control.ds_sql := control.ds_sql || sprintf (' and a.E_STATUS = ''%s''', self.tv_status);
+                              }  
+                            }
 
                             self.sortChange (get_keyword ('t_sortColumn', e.ve_params), 'ts_order', 'ts_direction', self.ds);
                             control.ds_sql := sprintf ('%s order by %s %s', control.ds_sql, self.ts_order, self.ts_direction);
@@ -3014,7 +3030,7 @@
                             <?vsp
                               }
                               M := 4;
-                              http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then '' else 'none' end, M));
+                              http (sprintf ('<tr id="s_tr_no" style="display: %s";><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then 'run-in' else 'none' end, M));
                             ?>
                           </table>
                           <input type="hidden" id="s_no" name="s_no" value="<?V L+1 ?>" />
@@ -3306,8 +3322,8 @@
                 <v:label for="t_eventEndDate" value="Start Date"/>
               </th>
               <td>
-                      <v:text name="t_eventStartDate" xhtml_id="t_eventStartDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventStart, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_eventStartDate, \'t_eventStartDate_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
-                          <a href="#" id="t_eventStartDate_select" onclick="cPopup.select(document.forms[0].t_eventStartDate, 't_eventStartDate_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
+                          <v:text name="t_eventStartDate" xhtml_id="t_eventStartDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventStart, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_eventStartDate\');" xhtml_class="textbox" xhtml_size="10" />
+                          <a href="#" id="t_eventStartDate_select" onclick="calendarPopup('t_eventStartDate'); return false;" class="noapp">
                   <img border="0" title="pick" alt="pick" src="image/pick_calendar.gif"/>
                 </a>
               </td>
@@ -3317,8 +3333,8 @@
                 <v:label for="t_eventEndDate" value="Due Date"/>
               </th>
               <td>
-                      <v:text name="t_eventEndDate" xhtml_id="t_eventEndDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventEnd, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_eventEndDate, \'t_eventEndDate_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
-                          <a href="#" id="t_eventEndDate_select" onclick="cPopup.select(document.forms[0].t_eventEndDate, 't_eventEndDate_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
+                          <v:text name="t_eventEndDate" xhtml_id="t_eventEndDate" null-value="--''" value="--CAL.WA.dt_datestring (self.v_eventEnd, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_eventEndDate\', \'t_eventStartDate\', \'t_eventStartDate\');" xhtml_class="textbox" xhtml_size="10" />
+                          <a href="#" id="t_eventEndDate_select" onclick="calendarPopup('t_eventEndDate', 't_eventStartDate', 't_eventStartDate'); return false;" class="noapp">
                   <img border="0" title="pick" alt="pick" src="image/pick_calendar.gif"/>
                 </a>
               </td>
@@ -3328,8 +3344,8 @@
                     <v:label for="t_completed" value="Completed" />
                   </th>
                   <td>
-                      <v:text name="t_completed" xhtml_id="t_completed" null-value="--''" value="--CAL.WA.dt_datestring (self.v_completed, self.cDateFormat)" xhtml_onclick="--sprintf ('cPopup.select(document.forms[0].t_completed, \'t_completed_select\', \'%s\');', self.cDateFormat)" xhtml_class="textbox" xhtml_size="10" />
-                          <a href="#" id="t_completed_select" onclick="cPopup.select(document.forms[0].t_completed, 't_completed_select', '<?V self.cDateFormat ?>'); return false;" class="noapp">
+                          <v:text name="t_completed" xhtml_id="t_completed" null-value="--''" value="--CAL.WA.dt_datestring (self.v_completed, self.cDateFormat)" xhtml_onclick="javascript: calendarPopup(\'t_completed\', \'t_eventEndDate\', \'t_eventStartDate\'); changeComplete(this);" xhtml_class="textbox" xhtml_size="10" xhtml_onchange="javascript: changeComplete(this);"/>
+                          <a href="#" id="t_completed_select" onclick="calendarPopup('t_completed', 't_eventEndDate', 't_eventStartDate'); changeComplete('t_completed'); return false;" class="noapp">
                         <img border="0" title="pick" alt="pick" src="image/pick_calendar.gif" />
                       </a>
                   </td>
@@ -3372,7 +3388,7 @@
                 <v:label for="t_status" value="Status"/>
               </th>
               <td>
-                      <v:select-list name="t_status" xhtml_id="t_status" xhtml_onchange="javascript: changeComplete(); ">
+                          <v:select-list name="t_status" xhtml_id="t_status" xhtml_onchange="javascript: changeComplete(this);">
                   <v:on-init>
                     <![CDATA[
                       declare x any;
@@ -3381,7 +3397,7 @@
                       x[0] := 'Not Started';
                       x[1] := 'In Progress';
                       x[2] := 'Completed';
-                      x[3] := 'Waiting.';
+                                x[3] := 'Waiting';
                       x[4] := 'Deferred';
                       control.vsl_item_values := x;
                       control.vsl_items := x;
@@ -3398,10 +3414,10 @@
             </tr>
             <tr>
               <th>
-                <v:label for="t_complete" value="% Complete"/>
+                          <v:label for="t_complete" value="Complete (%)" />
               </th>
               <td>
-                      <v:select-list name="t_complete" xhtml_id="t_complete" xhtml_onchange="javascript: changeComplete(); ">>
+                          <v:select-list name="t_complete" xhtml_id="t_complete" xhtml_onchange="javascript: changeComplete(this);">
                   <v:on-init>
                     <![CDATA[
                       declare x any;
@@ -3596,7 +3612,7 @@
                             <?vsp
                               }
                               M := 4;
-                              http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then '' else 'none' end, M));
+                              http (sprintf ('<tr id="s_tr_no" style="display: %s"><td colspan="%d"><b>No Sharings</b></td></tr>', case when L = 0 then 'run-in' else 'none' end, M));
                             ?>
                           </table>
                           <input type="hidden" id="s_no" name="s_no" value="<?V L+1 ?>" />
@@ -3836,10 +3852,10 @@
                     <th>
                       Source name
                   </th>
-                    <td id="imp_td_0" style="display: <?V case when self.icSource < 1 then '' else 'none' end ?>;">
+                    <td id="imp_td_0" style="display: <?V case when self.icSource < 1 then 'run-in' else 'none' end ?>;">
                       <input type="file" name="f_file" size="60" />
                   </td>
-                    <td id="imp_td_1" style="display: <?V case when self.icSource = 1 then '' else 'none' end ?>;">
+                    <td id="imp_td_1" style="display: <?V case when self.icSource = 1 then 'run-in' else 'none' end ?>;">
                       <v:text name="f_dav" xhtml_id="f_dav" value="--''" xhtml_size="60" /><v:button action="browse" name="browse" value="Browse...">
                    	  <v:after-data-bind>
                    		  <![CDATA[
@@ -3848,11 +3864,11 @@
               			  </v:after-data-bind>
               		  </v:button>
                   </td>
-                    <td id="imp_td_2" style="display: <?V case when self.icSource = 2 then '' else 'none' end ?>;">
+                    <td id="imp_td_2" style="display: <?V case when self.icSource = 2 then 'run-in' else 'none' end ?>;">
                       <v:text name="f_uri" value="--''" xhtml_size="60" />
                     </td>
                 </tr>
-                  <tr id="imp_tr_31" style="display: <?V case when self.icSource < 1 then 'none' else '' end ?>;">
+                  <tr id="imp_tr_31" style="display: <?V case when self.icSource < 1 then 'none' else 'run-in' end ?>;">
                     <th>
                       User
                   </th>
@@ -3860,7 +3876,7 @@
                       <v:text name="i_user" value="--self.icUser" xhtml_class="" />
                     </td>
                   </tr>
-                  <tr id="imp_tr_32" style="display: <?V case when self.icSource < 1 then 'none' else '' end ?>;">
+                  <tr id="imp_tr_32" style="display: <?V case when self.icSource < 1 then 'none' else 'run-in' end ?>;">
                     <th>
                       Password
                     </th>
@@ -4049,7 +4065,7 @@
                       </v:button>
                     </td>
                   </tr>
-                  <tr id="ex_tr_0" style="display: <?V case when self.exType < 1 then 'none' else '' end ?>;">
+                  <tr id="ex_tr_0" style="display: <?V case when self.exType < 1 then 'none' else 'run-in' end ?>;">
                     <th>
                       User
                     </th>
@@ -4057,7 +4073,7 @@
                       <v:text name="ex_user" value="--self.exUser" xhtml_class="" />
                     </td>
                   </tr>
-                  <tr id="ex_tr_1" style="display: <?V case when self.exType < 1 then 'none' else '' end ?>;">
+                  <tr id="ex_tr_1" style="display: <?V case when self.exType < 1 then 'none' else 'run-in' end ?>;">
                     <th>
                       Password
                     </th>
diff --git a/appsrc/ODS-Calendar/www/js/calendar.js b/appsrc/ODS-Calendar/www/js/calendar.js
index a987a5acf6..3ba739892e 100644
--- a/appsrc/ODS-Calendar/www/js/calendar.js
+++ b/appsrc/ODS-Calendar/www/js/calendar.js
@@ -46,7 +46,6 @@ function vspxPost(fButton, fName, fValue, f2Name, f2Value, f3Name, f3Value)
 }
 
 // ---------------------------------------------------------------------------
-//
 function submitEnter(e, fForm, fButton, fName, fValue, f2Name, f2Value, f3Name, f3Value)
 {
   var keyCode;
@@ -252,7 +251,6 @@ function showTag(tag)
 }
 
 // ---------------------------------------------------------------------------
-//
 // sortSelect(select_object)
 //   Pass this function a SELECT object and the options will be sorted
 //   by their text (display) values
@@ -279,7 +277,6 @@ function sortSelect(box)
 }
 
 // ---------------------------------------------------------------------------
-//
 function showTab(tabs, tabsCount, tabNo)
 {
   if ($(tabs))
@@ -309,7 +306,6 @@ function showTab(tabs, tabsCount, tabNo)
 }
 
 // ---------------------------------------------------------------------------
-//
 function windowShow(sPage, width, height)
 {
   if (width == null)
@@ -322,7 +318,6 @@ function windowShow(sPage, width, height)
 }
 
 // ---------------------------------------------------------------------------
-//
 function calendarsShow(sPage, width, height)
 {
   if ($('ss_type_0').checked)
@@ -333,7 +328,6 @@ function calendarsShow(sPage, width, height)
 }
 
 // ---------------------------------------------------------------------------
-//
 function calendarsHelp(mode)
 {
   var T = '';
@@ -351,7 +345,29 @@ function calendarsHelp(mode)
 }
 
 // ---------------------------------------------------------------------------
-//
+function calendarPopup(fld, startValueFld, disableToFld)
+{
+  if (cPopup)
+  {
+    var startValue;
+    if (startValueFld)
+      startValue = ($v(fld)=='')?$v(startValueFld):null;
+    cPopup.disabledDatesExpression = '';
+    if (disableToFld && $v(disableToFld) != '')
+    {
+      var disableToDate = getDateFromFormat($v(disableToFld), CAL.dateFormat);
+      if (disableToDate != 0)
+      {
+        disableToDate = new Date(disableToDate);
+        disableToDate.setDate(disableToDate.getDate()-1);
+        cPopup.addDisabledDates(null, formatDate(disableToDate, 'yyyy-MM-dd'));  
+      }
+    }  
+    cPopup.select($(fld), fld+'_select', CAL.dateFormat, startValue);
+  }  
+}
+
+// ---------------------------------------------------------------------------
 function rowSelect(obj)
 {
   var submitMode = false;
@@ -407,7 +423,6 @@ function rowSelect(obj)
 }
 
 // ---------------------------------------------------------------------------
-//
 function rowSelectValue(dstField, srcField, singleMode)
 {
   if (singleMode)
@@ -430,7 +445,6 @@ function rowSelectValue(dstField, srcField, singleMode)
 }
 
 // ---------------------------------------------------------------------------
-//
 // Menu functions
 //
 // ---------------------------------------------------------------------------
@@ -449,7 +463,6 @@ function menuMouseIn(a, b)
 }
 
 // ---------------------------------------------------------------------------
-//
 function menuMouseOut(event)
 {
   var current, related;
@@ -468,7 +481,6 @@ function menuMouseOut(event)
 }
 
 // ---------------------------------------------------------------------------
-//
 function menuPopup(button, menuID)
 {
   if (document.getElementsByTagName && !document.all)
@@ -507,18 +519,15 @@ function menuPopup(button, menuID)
 }
 
 // ---------------------------------------------------------------------------
-//
 // Hiddens functions
 //
 // ---------------------------------------------------------------------------
-//
 function createHidden(frm_name, fld_name, fld_value)
 {
   createHidden2(document, frm_name, fld_name, fld_value);
 }
 
 // ---------------------------------------------------------------------------
-//
 function createHidden2(doc, frm_name, fld_name, fld_value)
 {
   var hidden;
@@ -539,7 +548,6 @@ function createHidden2(doc, frm_name, fld_name, fld_value)
 }
 
 // ---------------------------------------------------------------------------
-//
 function changeExportName(fld_name, from, to)
 {
   var obj = document.forms['F1'].elements[fld_name];
@@ -548,7 +556,6 @@ function changeExportName(fld_name, from, to)
 }
 
 // ---------------------------------------------------------------------------
-//
 function updateChecked (obj, objName)
 {
   var objForm = obj.form;
@@ -577,7 +584,6 @@ function updateChecked (obj, objName)
 }
 
 // ---------------------------------------------------------------------------
-//
 function addChecked (form, txt, selectionMsq)
 {
   if (!anySelected (form, txt, selectionMsq, 'confirm'))
@@ -626,7 +632,6 @@ function addChecked (form, txt, selectionMsq)
 }
 
 // ---------------------------------------------------------------------------
-//
 function addTag(tag, objName)
 {
   var obj = document.F1.elements[objName];
@@ -649,7 +654,6 @@ function addTag(tag, objName)
 }
 
 // ---------------------------------------------------------------------------
-//
 function addCheckedTags (openerName, checkName)
 {
   if (window.opener.document.F1.elements[document.F1.elements[openerName].value])
@@ -883,9 +887,26 @@ function davBrowse (fld)
 }
 
 // ---------------------------------------------------------------------------
-function changeComplete ()
+function changeComplete (obj)
 {
-  return;
+  obj = $(obj);
+  if (obj.name == 't_completed' && CAL.trim(obj.value) != '')
+  {
+    $('t_status').value = 'Completed';
+    $('t_complete').value = '100';
+  }
+  else if (obj.name == 't_status' && obj.value == 'Completed')
+  {
+    if (CAL.trim($('t_completed').value) == '')
+      $('t_completed').value = $('t_eventEndDate').value;
+    $('t_complete').value = '100';
+  }
+  else if (obj.name == 't_complete' && obj.value == '100')
+  {
+    if (CAL.trim($('t_completed').value) == '')
+      $('t_completed').value = $('t_eventEndDate').value;
+    $('t_status').value = 'Completed';
+  }
 }
 
 // ---------------------------------------------------------------------------
diff --git a/appsrc/ODS-Calendar/www/template/template.vspx b/appsrc/ODS-Calendar/www/template/template.vspx
index 9d4820a401..c8ae2d8c82 100644
--- a/appsrc/ODS-Calendar/www/template/template.vspx
+++ b/appsrc/ODS-Calendar/www/template/template.vspx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  -
-  -  $Id$
+ -  $Id$
  -
  -  This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
  -  project.
@@ -75,6 +75,7 @@
             cPopup = OAT.Browser.isWebKit? new CalendarPopup(): new CalendarPopup('cDiv');
             cPopup.weekStartDay = <?V case when self.cWeekStarts = 's' then 0 else 1 end ?>;
           }
+          CAL.dateFormat = '<?V self.cDateFormat ?>';
 
           OAT.Preferences.imagePath = '/ods/images/oat/';
           OAT.Preferences.stylePath = '/ods/oat/styles/';
diff --git a/appsrc/ODS-Calendar/www/template/template.xsl b/appsrc/ODS-Calendar/www/template/template.xsl
index bb3417876b..ababdd0d6f 100644
--- a/appsrc/ODS-Calendar/www/template/template.xsl
+++ b/appsrc/ODS-Calendar/www/template/template.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  -
-  -  $Id$
+ -  $Id$
  -
  -  This file is part of the OpenLink Software Virtuoso Open-Source (VOS)
  -  project.
@@ -325,11 +325,11 @@
             http ('</tr>');
           ?>
           <tr id="c_footer" class="C_heading">
-            <td colspan="2" />
+            <td colspan="2"></td>
             <td class="C_onmonth C_today" colspan="3">
               <span id="c_today_0" onmousedown="cSelect(this)" style="font-weight: bold;">today</span>
             </td>
-            <td colspan="2" />
+            <td colspan="2"></td>
           </tr>
         </tbody>
       </table>
diff --git a/appsrc/ODS-Framework/comp/login.xsl b/appsrc/ODS-Framework/comp/login.xsl
index 85826a9c46..ca2a104795 100644
--- a/appsrc/ODS-Framework/comp/login.xsl
+++ b/appsrc/ODS-Framework/comp/login.xsl
@@ -341,7 +341,6 @@ if (not control.vl_authenticated and length(self.oid_sig))
      goto auth_failed1;
     };
     resp := HTTP_CLIENT (url);
---    dbg_obj_print (resp);
     if (resp not like '%is_valid:%true\n%')
       goto auth_failed1;
   }
diff --git a/appsrc/ODS-Framework/fb_front.vspx b/appsrc/ODS-Framework/fb_front.vspx
index 27f1417684..465f973057 100644
--- a/appsrc/ODS-Framework/fb_front.vspx
+++ b/appsrc/ODS-Framework/fb_front.vspx
@@ -153,7 +153,6 @@
                )
               )
             {
---              _fb_user := self._fb.require_login(1);
               self._fb_usernotcorrespond:=1;
             }
 
@@ -332,18 +331,11 @@
                  if(length(syncdata_jsarrstr))
                   self._dhtml:=vector_concat(self._dhtml,vector('syncdata_jsarrstr',syncdata_jsarrstr));
               }
-
---                 sync_fbf_odsab(self._fb,_user_id,_fb_user,1);
-
               contatcst_import_res:=sync_fbf_odsab(self._fb,_user_id,_fb_user,0,1);
               self.syncdata_arr:=vector_concat(vector(_fb_user),contatcst_import_res);
-
             }
-
-
             _html:='';
 
-
             if(_user_id is null or _fb_user is null or _fb_user=0)
             {
                if(_user_id is not null)
diff --git a/appsrc/ODS-Framework/nav_framework_api.sql b/appsrc/ODS-Framework/nav_framework_api.sql
index 20cd139ba5..3746a75ec3 100644
--- a/appsrc/ODS-Framework/nav_framework_api.sql
+++ b/appsrc/ODS-Framework/nav_framework_api.sql
@@ -382,7 +382,6 @@ usersGetInfo (in sid varchar := '',
      state := '00000';
      msg := '';
      qry := usersinfo_sql(usersStr,fieldsStr);
---     dbg_obj_print(qry);
      exec (qry, state, msg, vector(), maxrows, metas, rset);
      if (state = '00000' and length(rset)>0)
      {
@@ -729,11 +728,8 @@ create procedure applicationsGet (in sid varchar := '',
 
   q_str:=sprintf('%s order by  WAM_APP_TYPE,WAM_INST ',q_str);
 
-
---  dbg_obj_print(q_str);
   declare INST_URL,INST_NAME,INST_OWNER, INST_WATYPE varchar;
 
-
   rc := exec (q_str, null, null, vector (), 0, null, null, h);
   while (0 = exec_next (h, null, null, dta))
   {
diff --git a/appsrc/ODS-Framework/search.vspx b/appsrc/ODS-Framework/search.vspx
index 4f872906b1..552a1d8a28 100644
--- a/appsrc/ODS-Framework/search.vspx
+++ b/appsrc/ODS-Framework/search.vspx
@@ -426,7 +426,6 @@
     }
     else
     connection_set ('WA_SEARCH_PATH', '');
-      --dbg_printf ('%s', query);
     exec (query, NULL, NULL, vector (), 0, meta, res);
 
     if (WA_IS_REGULAR_FEED ())
diff --git a/appsrc/ODS-Framework/sioc.sql b/appsrc/ODS-Framework/sioc.sql
index 572a2199f0..61e515c1ae 100644
--- a/appsrc/ODS-Framework/sioc.sql
+++ b/appsrc/ODS-Framework/sioc.sql
@@ -513,7 +513,16 @@ create procedure ods_sioc_forum_type (in app varchar)
   return sioc_iri (pclazz);
 };
 
+create procedure ods_init_ft ()
+{
+  if (1 = sys_stat ('cl_run_local_only'))
+    {
 DB.DBA.RDF_OBJ_FT_RULE_ADD (get_graph (), null, 'ODS RDF Data');
+    }
+}
+;
+
+ods_init_ft ();
 
 create procedure ods_graph_init ()
 {
@@ -784,14 +793,6 @@ create procedure sioc_user_info (
     return;
   is_person := 1;
 
---  delete_quad_sp (graph_iri, iri, sioc_iri ('first_name'));
---  delete_quad_sp (graph_iri, iri, sioc_iri ('last_name'));
-
---  if (length (waui_first_name) and wa_user_pub_info (flags, 1))
---    DB.DBA.RDF_QUAD_URI_L (graph_iri, iri, sioc_iri ('first_name'), waui_first_name);
---  if (length (waui_last_name) and wa_user_pub_info (flags, 2))
---    DB.DBA.RDF_QUAD_URI_L (graph_iri, iri, sioc_iri ('last_name'), waui_last_name);
-
   iri := person_iri (in_iri, '');
   org_iri := iri || '#org';
   addr_iri := iri || '#addr';
@@ -1954,6 +1955,15 @@ create procedure ods_current_ver ()
   return '25';
 };
 
+create procedure ods_sioc_atomic (in f int)
+{
+  if (1 = sys_stat ('cl_run_local_only'))
+    {
+      __atomic (f);
+    }
+}
+;
+
 create procedure ods_sioc_init ()
 {
   registry_set ('__ods_sioc_version', ods_current_ver ());
@@ -1962,15 +1972,15 @@ create procedure ods_sioc_init ()
     return;
   declare exit handler for sqlstate '*'
     {
-      __atomic (0);
+      ods_sioc_atomic (0);
       resignal;
     };
-  __atomic (1);
+  ods_sioc_atomic (1);
   DB.DBA.TTLP (sioct_n3 (), '', get_graph() || '/inf');
   DB.DBA.RDFS_RULE_SET (get_graph (), get_graph() || '/inf');
   fill_ods_sioc (1);
   registry_set ('__ods_sioc_init', registry_get ('__ods_sioc_version'));
-  __atomic (0);
+  ods_sioc_atomic (0);
   return;
 };
 
diff --git a/appsrc/ODS-Framework/vad_version b/appsrc/ODS-Framework/vad_version
index 977344a5d9..da94f44973 100644
--- a/appsrc/ODS-Framework/vad_version
+++ b/appsrc/ODS-Framework/vad_version
@@ -1 +1 @@
-1.61.92
+1.61.93
diff --git a/appsrc/ODS-Framework/version.curr b/appsrc/ODS-Framework/version.curr
index 3c2a84a2c6..a491d05d77 100644
--- a/appsrc/ODS-Framework/version.curr
+++ b/appsrc/ODS-Framework/version.curr
@@ -1 +1 @@
-6192
+6193
diff --git a/binsrc/jena/Makefile.am b/binsrc/jena/Makefile.am
index 1aa4b26058..7980a8d7b6 100644
--- a/binsrc/jena/Makefile.am
+++ b/binsrc/jena/Makefile.am
@@ -20,16 +20,16 @@
 #  
 
 
-if JDK3
+if WITH_JDK3
 TARGETS		= virt_jena.jar
 JDK		= @ac_jdk3_path@
 JDK_FLAGS	= -Xlint -O -g:none
 
-JAVA		= $(JDK)/bin/java
-JAVAC		= $(JDK)/bin/javac
-JAVAH		= $(JDK)/bin/javah
-JAVADOC		= $(JDK)/bin/javadoc
-JAR		= $(JDK)/bin/jar
+JAVA		= $(JDK)/java
+JAVAC		= $(JDK)/javac
+JAVAH		= $(JDK)/javah
+JAVADOC		= $(JDK)/javadoc
+JAR		= $(JDK)/jar
 endif
 
 
@@ -51,6 +51,7 @@ TESTSUITE_SRC= \
 
 JENA_CLASSPATH=lib/arq.jar:lib/iri.jar:lib/jena.jar:lib/jenatest.jar:lib/junit.jar:$(top_srcdir)/libsrc/JDBCDriverType4/virtjdbc3.jar
 
+
 all-am:	lib virt_jena.jar
 
 install-data-local:
@@ -75,9 +76,9 @@ doc:
 		$(JENA_SRC)
 	
 #
-#  Run testsuite if JDK was found
+#  Run testsuite if WITH_JDK was found
 #
-if JDK3
+if WITH_JDK3
 run-tests: virt_jena.jar
 	$(JAVAC) $(JDK_FLAGS) \
 		-classpath "$(JENA_CLASSPATH):./virt_jena.jar" \
diff --git a/binsrc/sesame/Makefile.am b/binsrc/sesame/Makefile.am
index e88d24bbb4..26cf26d2c7 100644
--- a/binsrc/sesame/Makefile.am
+++ b/binsrc/sesame/Makefile.am
@@ -20,14 +20,14 @@
 #  
 
 
-if JDK3
+if WITH_JDK3
 TARGETS		= virt_sesame.jar
 JDK		= @ac_jdk3_path@
-JDK_FLAGS	= -Xlint -O -g:none
-JAVAC		= $(JDK)/bin/javac
-JAVAH		= $(JDK)/bin/javah
-JAVADOC		= $(JDK)/bin/javadoc
-JAR		= $(JDK)/bin/jar
+JDK_FLAGS	= -O -g:none
+JAVAC		= $(JDK)/javac
+JAVAH		= $(JDK)/javah
+JAVADOC		= $(JDK)/javadoc
+JAR		= $(JDK)/jar
 endif
 
 
@@ -53,9 +53,11 @@ lib:
 virt_sesame.jar: $(SESAME_SRC)
 	-rm -rf out.driver
 	@mkdir out.driver
+	env PATH="$(JDK)/Commands:$(JDK)/bin:$(PATH)" \
 	$(JAVAC) $(JDK_FLAGS) -d out.driver \
 		-classpath "$(SESAME_CLASSPATH)" \
 		$(SESAME_SRC)
+	env PATH="$(JDK)/Commands:$(JDK)/bin:$(PATH)" \
 	$(JAR) cvf virt_sesame.jar -C out.driver virtuoso
 	
 
diff --git a/binsrc/sesame2/Makefile.am b/binsrc/sesame2/Makefile.am
index 5169005636..eeca120b0d 100644
--- a/binsrc/sesame2/Makefile.am
+++ b/binsrc/sesame2/Makefile.am
@@ -20,15 +20,15 @@
 #  
 
 
-if JDK3
+if WITH_JDK3
 TARGETS		= virt_sesame2.jar
 JDK		= @ac_jdk3_path@
 JDK_FLAGS	= -Xlint -O -g:none
-JAVA		= $(JDK)/bin/java
-JAVAC		= $(JDK)/bin/javac
-JAVAH		= $(JDK)/bin/javah
-JAVADOC		= $(JDK)/bin/javadoc
-JAR		= $(JDK)/bin/jar
+JAVA		= $(JDK)/java
+JAVAC		= $(JDK)/javac
+JAVAH		= $(JDK)/javah
+JAVADOC		= $(JDK)/javadoc
+JAR		= $(JDK)/jar
 endif
 
 
@@ -72,7 +72,7 @@ doc:
 		$(SESAME_SRC)
 
 
-if JDK3
+if WITH_JDK3
 run-tests: virt_sesame2.jar
 	-rm -rf out.examples
 	-mkdir out.examples
diff --git a/binsrc/sesame3/Makefile.am b/binsrc/sesame3/Makefile.am
index 130d206058..f52481ac61 100644
--- a/binsrc/sesame3/Makefile.am
+++ b/binsrc/sesame3/Makefile.am
@@ -20,15 +20,15 @@
 #  
 
 
-if JDK3
+if WITH_JDK3
 TARGETS		= virt_sesame3.jar
 JDK		= @ac_jdk3_path@
 JDK_FLAGS	= -Xlint -O -g:none
-JAVA		= $(JDK)/bin/java
-JAVAC		= $(JDK)/bin/javac
-JAVAH		= $(JDK)/bin/javah
-JAVADOC		= $(JDK)/bin/javadoc
-JAR		= $(JDK)/bin/jar
+JAVA		= $(JDK)/java
+JAVAC		= $(JDK)/javac
+JAVAH		= $(JDK)/javah
+JAVADOC		= $(JDK)/javadoc
+JAR		= $(JDK)/jar
 endif
 
 
@@ -57,7 +57,7 @@ lib:
 	@echo "Please refer to README file for missing .jar files"
 
 
-virt_sesame3.jar: $(SESAME_SRC) Makefile.am
+virt_sesame3.jar: $(SESAME_SRC)
 	-rm -rf out.driver
 	-mkdir out.driver
 	$(JAVAC) $(JDK_FLAGS) -d out.driver \
@@ -72,7 +72,7 @@ doc:
 		$(SESAME_SRC)
 
 
-if JDK3
+if WITH_JDK3
 run-tests: virt_sesame3.jar
 	-rm -rf out.examples
 	-mkdir out.examples
diff --git a/binsrc/virtuoso/viconfig.c b/binsrc/virtuoso/viconfig.c
index 3075639649..66a32e2a4c 100644
--- a/binsrc/virtuoso/viconfig.c
+++ b/binsrc/virtuoso/viconfig.c
@@ -318,7 +318,7 @@ int32 c_http_max_keep_alives = 0;
 int32 c_http_keep_alive_timeout = 0;
 int32 c_http_max_cached_proxy_connections = 0;
 int32 c_http_proxy_connection_cache_timeout = 0;
-int32 c_http_thread_sz = 140000;
+int32 c_http_thread_sz = 280000;
 int32 c_http_keep_hosting = 0;
 extern long http_keep_hosting; /* from http.c */
 char *c_ucm_load_path = 0;
@@ -1164,9 +1164,9 @@ cfg_setup (void)
     c_http_proxy_connection_cache_timeout = 0;
 
   if (cfg_getlong (pconfig, section, "HTTPThreadSize", &c_http_thread_sz) == -1)
-    c_http_thread_sz = 140000;
-  if (c_http_thread_sz < 140000)
-    c_http_thread_sz = 140000;
+    c_http_thread_sz = 280000;
+  if (c_http_thread_sz < 280000)
+    c_http_thread_sz = 280000;
   if (c_http_thread_sz < c_future_thread_sz)
     c_http_thread_sz = c_future_thread_sz;
   if (c_http_thread_sz > c_future_thread_sz)
diff --git a/configure.in b/configure.in
index 7cd9ef48f6..0f3525e18b 100644
--- a/configure.in
+++ b/configure.in
@@ -1068,77 +1068,6 @@ if test "$with_rvous" = "yes"; then
 fi
 
 
-##########################################################################
-#                                                                        #
-# PHP 4.x hosting                                                        #
-#                                                                        #
-##########################################################################
-
-with_php4="no"
-AC_ARG_ENABLE(php4, [dnl
-AC_HELP_STRING([--enable-php4(=DIR)], [enable PHP 4.x extension])
-AC_HELP_STRING([--disable-php4], [disable PHP 4.x extension (default)])dnl
-], [
-     case "${enableval}" in
-       yes)	with_php4="yes" ;;
-       no)	with_php4="no" ;;
-       /*)	with_php4="${enableval}" ;;
-       *)	AC_MSG_ERROR(bad value ${enableval} for --enable-php4) ;;
-     esac
-  ],
-  [ with_php4="no" ]
-)
-
-if test "x$with_php4" != "xno"
-then
-    AC_MSG_CHECKING([libphp4 library usability])
-    save_CPPFLAGS="$CPPFLAGS"
-    save_LIBS="$LIBS"
-    old_LD_LIBRARY_PATH="$LD_LIBRARY_PATH"
-    case "$with_php4" in
-	yes)
-	   php4_CFLAGS=""
-	   php4_LDFLAGS="-lphp4"
-	   ;;
-	*)
-	   php4_CFLAGS="-I$with_php4/include/php/main -I$with_php4/include/php/Zend -I$with_php4/include/php/TSRM -I$with_php4/include/php"
-	   php4_LDFLAGS="-L$with_php4/lib -lphp4"
-	   LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$with_php4/lib"
-	   export LD_LIBRARY_PATH
-	   ;;
-    esac
-    CPPFLAGS="$CPPFLAGS $php4_CFLAGS"
-    LIBS="$LIBS $php4_LDFLAGS"
-    AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <php.h>
-int
-main ()
-{
-  return 0;
-}],
-[
- AC_MSG_RESULT(good)
- BUILD_OPTS="$BUILD_OPTS php4"
- AC_DEFINE(_PHP, 1, [PHP])
- with_php4="yes"
-],
-[
- AC_MSG_RESULT([bad. Check config.log for details])
- with_php4="no"
-])
-    LIBS="$save_LIBS"
-    CPPFLAGS="$save_CPPFLAGS"
-    LD_LIBRARY_PATH="$old_LD_LIBRARY_PATH"
-    export LD_LIBRARY_PATH
-fi
-AM_CONDITIONAL(HAVE_PHP4, test "x$with_php4" != "xno" )
-AC_SUBST(php4_CFLAGS)
-AC_SUBST(php4_LDFLAGS)
-
-
 ##########################################################################
 #                                                                        #
 # PHP 5.x hosting                                                        #
@@ -1605,6 +1534,32 @@ AC_SUBST(RUBY_CFLAGS)
 AC_SUBST(RUBY_LDFLAGS)
 
 
+##########################################################################
+##									##
+##  Check out system zlib library					##
+##									##
+##########################################################################
+with_zlib="no"
+AC_ARG_WITH(internal-zlib, [dnl
+AC_HELP_STRING([--with-internal-zlib], [use internal zlib library (default)])
+AC_HELP_STRING([--without-internal-zlib], [use external zlib support])dnl
+], [
+     case "${withval}" in
+       yes)	with_zlib="internal";;
+       no)	with_zlib="external";;
+       *)	AC_MSG_ERROR(bad value ${withval} for --enable-zlib) ;;
+     esac
+  ],
+  [ with_zlib="internal" ]
+)
+
+if test "x$with_zlib" != "xinternal"
+then
+    AC_CHECK_HEADER(zlib.h)
+    AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal])
+fi
+AM_CONDITIONAL(WITH_ZLIB, test "x$with_zlib" = "xinternal")
+
 dnl PUT OTHER EXTENSIONS HERE
 
 
@@ -2017,18 +1972,19 @@ ac_cv_prog_java_works=no
 #echo macro called with ac_jw_jdk="$ac_jw_jdk" ac_jw_min_minor="$ac_jw_min_minor" ac_jw_max_minor="$ac_jw_max_minor"
 if test "x$ac_jw_jdk" != "xnone" ; then
   AC_MSG_CHECKING([for working Java 1.$ac_jw_min_minor.x-1.$ac_jw_max_minor.x in $ac_jw_jdk])
-  #echo ac_jw_jdk/bin/java="$ac_jw_jdk/bin/java"
-  ac_java_version=`$ac_jw_jdk/bin/java -version 2>&1 | grep 'java version' | cut -f 2 -d '"'`
-  #echo ac_java_version="$ac_java_version"
+  if test -x "$ac_jw_jdk/Commands/java"; then
+    ac_jw_jdk="$ac_jw_jdk/Commands" 
+  else
+    ac_jw_jdk="$ac_jw_jdk/bin" 
+  fi
+  JAVAC=$ac_jw_jdk/javac
+  JAVA=$ac_jw_jdk/java
+  ac_java_version=`$JAVA -version 2>&1 | grep 'java version' | cut -f 2 -d '"'`
   ac_java_ver_major=`echo $ac_java_version | cut -f 1 -d .`
   ac_java_ver_minor=`echo $ac_java_version | cut -f 2 -d .`
-  #echo ac_java_ver_major="$ac_java_ver_major"
-  #echo ac_java_ver_minor="$ac_java_ver_minor"
   if test "x$ac_java_ver_major" != "x1" -o "0$ac_java_ver_minor" -lt "0$ac_jw_min_minor" -o "0$ac_java_ver_minor" -gt "0$ac_jw_max_minor" ; then
       AC_MSG_ERROR([wrong version ($ac_java_ver_major.$ac_java_ver_minor)])
   fi
-  JAVAC=$ac_jw_jdk/bin/javac
-  JAVA=$ac_jw_jdk/bin/java
   JAVA_TEST=Test.java
   CLASS_TEST=Test.class
   TEST=Test
@@ -2062,31 +2018,35 @@ fi
 
 AC_PROG_JAVA_WORKS($ac_jdk1_path, 1, 1)
 ac_jdk1_works="$ac_cv_prog_java_works"
-AM_CONDITIONAL(JDK1, test "x$ac_jdk1_works" = "xyes")
+ac_jdk1_path="$ac_jw_path"
+AM_CONDITIONAL(WITH_JDK1, test "x$ac_jdk1_works" = "xyes")
 AC_SUBST(ac_jdk1_path)
 
 AC_PROG_JAVA_WORKS($ac_jdk2_path, 2, 3)
 ac_jdk2_works="$ac_cv_prog_java_works"
-AM_CONDITIONAL(JDK2, test "x$ac_jdk2_works" = "xyes")
+ac_jdk2_path="$ac_jw_jdk"
+AM_CONDITIONAL(WITH_JDK2, test "x$ac_jdk2_works" = "xyes")
 AC_SUBST(ac_jdk2_path)
 
 AC_PROG_JAVA_WORKS($ac_jdk3_path, 4, 5)
 ac_jdk3_works="$ac_cv_prog_java_works"
-AM_CONDITIONAL(JDK3, test "x$ac_jdk3_works" = "xyes")
+ac_jdk3_path="$ac_jw_jdk"
+AM_CONDITIONAL(WITH_JDK3, test "x$ac_jdk3_works" = "xyes")
 AC_SUBST(ac_jdk3_path)
 
 AC_PROG_JAVA_WORKS($ac_jdk4_path, 6, 6)
 ac_jdk4_works="$ac_cv_prog_java_works"
-AM_CONDITIONAL(JDK4, test "x$ac_jdk4_works" = "xyes")
+ac_jdk4_path="$ac_jw_jdk"
+AM_CONDITIONAL(WITH_JDK4, test "x$ac_jdk4_works" = "xyes")
 AC_SUBST(ac_jdk4_path)
 
 ac_integ_jdk=""
 if test "x$ac_jdk4_works" = "xyes" ; then
-  ac_integ_jdk="$ac_jdk4_path"
+  ac_integ_jdk="$ac_jdk4_path/.."
 elif test "x$ac_jdk3_works" = "xyes" ; then
-  ac_integ_jdk="$ac_jdk3_path"
+  ac_integ_jdk="$ac_jdk3_path/.."
 elif test "x$ac_jdk2_works" = "xyes"; then
-  ac_integ_jdk="ac_jdk2_path"
+  ac_integ_jdk="ac_jdk2_path/.."
 fi
 
 if test "x$ac_integ_jdk" != "x" ; then
@@ -2095,6 +2055,16 @@ if test "x$ac_integ_jdk" != "x" ; then
     ac_save_CPPFLAGS="$CPPFLAGS"
     #supported jvm hosting platforms : add more here
     case $host in
+	x64_64-*-linux*)
+                CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
+        	AC_CHECK_HEADERS(jni.h,
+			[ java_CPPFLAGS="-I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux" ],
+			[ ac_integ_jdk="" ])
+		AC_CHECK_LIB(jvm, JNI_GetDefaultJavaVMInitArgs,
+			[ java_LDFLAGS="-L$ac_integ_jdk/jre/lib/amd64/server -ljvm" ],
+			[ ac_integ_jdk="" ],
+			[ "-L$ac_integ_jdk/jre/lib/amd64/server"])
+		;;
 	i?86-*-linux*)
                 CPPFLAGS="$CPPFLAGS -I$ac_integ_jdk/include -I$ac_integ_jdk/include/linux"
         	AC_CHECK_HEADERS(jni.h,
diff --git a/libsrc/JDBCDriverType4/Makefile.am b/libsrc/JDBCDriverType4/Makefile.am
index aa8add3c2d..879602732c 100644
--- a/libsrc/JDBCDriverType4/Makefile.am
+++ b/libsrc/JDBCDriverType4/Makefile.am
@@ -19,22 +19,22 @@
 #  
 #  
 
-if JDK1
+if WITH_JDK1
 JDK1_TARGETS = jdk1-target
 JDK1_TEST = jdk1-test
 endif
 
-if JDK2
+if WITH_JDK2
 JDK2_TARGETS = jdk2-target
 JDK2_TEST = jdk2-test
 endif
 
-if JDK3
+if WITH_JDK3
 JDK3_TARGETS = jdk3-target
 JDK3_TEST = jdk3-test
 endif
 
-if JDK4
+if WITH_JDK4
 JDK4_TARGETS = jdk4-target
 JDK4_TEST = jdk4-test
 endif
diff --git a/libsrc/JDBCDriverType4/test.sh b/libsrc/JDBCDriverType4/test.sh
index 3fe858ee09..d4ef884823 100755
--- a/libsrc/JDBCDriverType4/test.sh
+++ b/libsrc/JDBCDriverType4/test.sh
@@ -21,29 +21,29 @@
 #  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
-JAVA_HOME=$JDK1
-CLASSPATH=$JAVA_HOME/lib/classes.zip:./security/jnet.jar:./security/jsse.jar:./security/jcert.jar
-export JAVA_HOME CLASSPATH
+CLASSPATH=./security/jnet.jar:./security/jsse.jar:./security/jcert.jar
+JAVA=$JDK1/java
+export JAVA CLASSPATH
 
 echo "............. Test the JDBC 1.2 driver"
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestClean
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestURL $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestDatabaseMetaData $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecute $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteFetch $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteBlob termcap $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecuteBatch $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareExecute $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareBatch $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestCallableExecute $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScroll $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollManual $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollPrepare $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestVarbinary $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestNumeric $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestClean
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestURL $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestDatabaseMetaData $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecute $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteFetch $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestExecuteBlob termcap $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestSimpleExecuteBatch $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareExecute $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestPrepareBatch $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestCallableExecute $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScroll $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollManual $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestScrollPrepare $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestVarbinary $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestNumeric $1
 rm -f bloor.pdf
 cat testsuite2.jar testsuite2.jar testsuite2.jar > bloor.pdf
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestBlob edsj
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.test2276 $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestTimeUpdate $1
-$JAVA_HOME/bin/java -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestMoreRes $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestBlob edsj
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.test2276 $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestTimeUpdate $1
+$JAVA -classpath $CLASSPATH:virtjdbc.jar:testsuite.jar testsuite.TestMoreRes $1
diff --git a/libsrc/JDBCDriverType4/test2.sh b/libsrc/JDBCDriverType4/test2.sh
index da52434bf6..9c2e4a7505 100755
--- a/libsrc/JDBCDriverType4/test2.sh
+++ b/libsrc/JDBCDriverType4/test2.sh
@@ -21,18 +21,12 @@
 #  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
-JAVA_HOME=$JDK2
-CLASSPATH=$JAVA_HOME/lib/jre/rt.jar
-CLASSPATHSSL=$JAVA_HOME/lib/jre/rt.jar:./security/jdk1.2/jnet.jar:./security/jdk1.2/jsse.jar:./security/jdk1.2/jcert.jar
-export JAVA_HOME CLASSPATH CLASSPATHSSL
+CLASSPATH=.
+CLASSPATHSSL=.:./security/jdk1.2/jnet.jar:./security/jdk1.2/jsse.jar:./security/jdk1.2/jcert.jar
+JAVA=$JDK2/java
+export JAVA CLASSPATH CLASSPATHSSL
+
 
-MACOSX=`grep Darwin ../../Makeconfig`
-if [ ! -z "$MACOSX" ]
-then
-    JAVA=$JAVA_HOME/Commands/java
-else
-    JAVA=$JAVA_HOME/bin/java
-fi
 echo "............. Test the JDBC 2.0 driver without SSL"
 $JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestClean $1
 $JAVA -classpath $CLASSPATH:virtjdbc2.jar:testsuite2.jar testsuite.TestURL $1
diff --git a/libsrc/JDBCDriverType4/test3.sh b/libsrc/JDBCDriverType4/test3.sh
index 34e9300f43..fae33c978a 100755
--- a/libsrc/JDBCDriverType4/test3.sh
+++ b/libsrc/JDBCDriverType4/test3.sh
@@ -21,17 +21,10 @@
 #  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
-JAVA_HOME=$JDK3
-CLASSPATH=$JAVA_HOME/lib/jre/rt.jar
-CLASSPATHSSL=$JAVA_HOME/lib/jre/rt.jar
-export JAVA_HOME CLASSPATH CLASSPATHSSL
-
-if [ -x "$JAVA_HOME/Commands/java" ]
-then
-    JAVA="$JAVA_HOME/Commands/java"
-else
-    JAVA="$JAVA_HOME/bin/java"
-fi
+CLASSPATH=.
+CLASSPATHSSL=.
+JAVA=$JDK3/java
+export JAVA CLASSPATH CLASSPATHSSL
 
 echo "............. Test the JDBC 3.0 driver without SSL"
 $JAVA -classpath $CLASSPATH:virtjdbc3ssl.jar:testsuite3.jar testsuite.TestClean $1
diff --git a/libsrc/JDBCDriverType4/test4.sh b/libsrc/JDBCDriverType4/test4.sh
index 30bccbfbe1..cc9160fcc7 100755
--- a/libsrc/JDBCDriverType4/test4.sh
+++ b/libsrc/JDBCDriverType4/test4.sh
@@ -21,18 +21,10 @@
 #  51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 
-JAVA_HOME=$JDK4
-CLASSPATH=$JAVA_HOME/lib/jre/rt.jar
-CLASSPATHSSL=$JAVA_HOME/lib/jre/rt.jar
-export JAVA_HOME CLASSPATH CLASSPATHSSL
-
-MACOSX=`grep Darwin ../../Makeconfig`
-if [ z != "z$MACOSX" ]
-then
-    JAVA=$JAVA_HOME/Commands/java
-else
-    JAVA=$JAVA_HOME/bin/java
-fi
+CLASSPATH=.
+CLASSPATHSSL=.
+JAVA=$JDK4/java
+export JAVA CLASSPATH CLASSPATHSSL
 
 echo "............. Test the JDBC 4.0 driver without SSL"
 $JAVA -classpath $CLASSPATH:virtjdbc4ssl.jar:testsuite4.jar testsuite.TestClean $1
diff --git a/libsrc/JDBCDriverType4/testsuite_1.2/Makefile.am b/libsrc/JDBCDriverType4/testsuite_1.2/Makefile.am
index c33d02c469..460aba4df3 100644
--- a/libsrc/JDBCDriverType4/testsuite_1.2/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_1.2/Makefile.am
@@ -19,20 +19,20 @@
 #  
 #  
 
-if JDK1
+if WITH_JDK1
+TARGET		= testsuite.jar
 JDK1 		= @ac_jdk1_path@
 JAVA_FLAGS	= -O -d .
-TARGET		= testsuite.jar
+JAVA_CLASS	= -classpath .:../virtjdbc.jar 
 endif
 
-JAVA_CLASS	:= -classpath $(CLASSPATH1):../virtjdbc.jar 
 
 all: $(TARGET)
 
 testsuite.jar: *.java
 	@echo ts1 javac $(JAVA_FLAGS) 
-	@$(JDK1)/bin/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
-	@$(JDK1)/bin/jar cf testsuite.jar ./testsuite/*.class
+	@$(JDK1)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
+	@$(JDK1)/jar cf testsuite.jar ./testsuite/*.class
 	@rm -f ../testsuite.jar
 	@cp testsuite.jar ../testsuite.jar
 	@echo "............. Test suite jar package built"
diff --git a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
index c6068be90c..02070f1a67 100644
--- a/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_2.0/Makefile.am
@@ -19,20 +19,20 @@
 #  
 #  
 
-if JDK2
+if WITH_JDK2
+TARGET		= testsuite2.jar
 JDK2 		= @ac_jdk2_path@
 JAVA_FLAGS	= -O -g:none -d .
-JAVA_CLASS      = -classpath $(CLASSPATH2):../virtjdbc2.jar
-TARGET		= testsuite2.jar
+JAVA_CLASS      = -classpath .:../virtjdbc2.jar
 endif
 
-all: $(TARGET)
 
+all: $(TARGET)
 
 testsuite2.jar: *.java
 	@echo ts2 java $(JAVA_FLAGS)
-	@$(JDK2)/bin/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
-	@$(JDK2)/bin/jar cf testsuite2.jar ./testsuite/*.class
+	@$(JDK2)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
+	@$(JDK2)/jar cf testsuite2.jar ./testsuite/*.class
 	@rm -f ../testsuite2.jar
 	@cp testsuite2.jar ../testsuite2.jar
 	@echo "............. Test suite jar package built"
diff --git a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
index 110e98e2cf..8d70271007 100644
--- a/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_3.0/Makefile.am
@@ -19,11 +19,11 @@
 #  
 #  
 
-if JDK3
+if WITH_JDK3
+TARGET		= testsuite3.jar
 JDK3 		= @ac_jdk3_path@
 JAVA_FLAGS	= -O -g:none -d .
-JAVA_CLASS	= -classpath $(CLASSPATH3):../virtjdbc3.jar
-TARGET		= testsuite3.jar
+JAVA_CLASS	= -classpath .:../virtjdbc3.jar
 endif
 
 all: $(TARGET)
@@ -31,8 +31,8 @@ all: $(TARGET)
 
 testsuite3.jar: *.java
 	@echo ts3 javac $(JAVA_FLAGS)
-	@$(JDK3)/bin/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
-	@$(JDK3)/bin/jar cf testsuite3.jar ./testsuite/*.class
+	@$(JDK3)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
+	@$(JDK3)/jar cf testsuite3.jar ./testsuite/*.class
 	@rm -f ../testsuite3.jar
 	@cp testsuite3.jar ../testsuite3.jar
 	@echo "............. Test suite jar package built"
diff --git a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
index d650589e5a..35ef4b4d2b 100644
--- a/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
+++ b/libsrc/JDBCDriverType4/testsuite_4.0/Makefile.am
@@ -19,20 +19,20 @@
 #  
 #  
 
-if JDK4
+if WITH_JDK4
+TARGET		= testsuite4.jar
 JDK4 		= @ac_jdk4_path@
 JAVA_FLAGS	= -O -g:none -d .
-JAVA_CLASS	= -classpath $(CLASSPATH4):../virtjdbc4.jar
-TARGET		= testsuite4.jar
+JAVA_CLASS	= -classpath .:../virtjdbc4.jar
 endif
 
-all: $(TARGET)
 
+all: $(TARGET)
 
 testsuite4.jar: *.java
 	@echo ts4 javac $(JAVA_FLAGS)
-	@$(JDK4)/bin/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
-	@$(JDK4)/bin/jar cf testsuite4.jar ./testsuite/*.class
+	@$(JDK4)/javac $(JAVA_FLAGS) $(JAVA_CLASS) *.java
+	@$(JDK4)/jar cf testsuite4.jar ./testsuite/*.class
 	@rm -f ../testsuite4.jar
 	@cp testsuite4.jar ../testsuite4.jar
 	@echo "............. Test suite jar package built"
diff --git a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
index d8bbe6df4f..2cf8c7dea6 100644
--- a/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
+++ b/libsrc/JDBCDriverType4/virtuoso/jdbc2/Makefile.am
@@ -19,25 +19,25 @@
 #  
 #  
 
-if JDK1
+if WITH_JDK1
 CLASSPATH1=$(CLASSPATH1):.:$(JDK1)/lib/classes.zip
 JDK1=@ac_jdk1_path@
 JDK1_FLAGS=-O
 endif
 
-if JDK2
+if WITH_JDK2
 CLASSPATH2=$(CLASSPATH2):.:$(JDK2)/jre/lib/rt.jar:$(top_srcdir)/libsrc/JDBCDriverType4/security/jdk1.2/jcert.jar:$(top_srcdir)/libsrc/JDBCDriverType4/security/jdk1.2/jnet.jar:$(top_srcdir)/libsrc/JDBCDriverType4/security/jdk1.2/jsse.jar
 JDK2=@ac_jdk2_path@
 JDK2_FLAGS=-O -g:none
 endif
 
-if JDK3
+if WITH_JDK3
 CLASSPATH3=$(CLASSPATH3)
 JDK3=@ac_jdk3_path@
 JDK3_FLAGS=-O -g:none
 endif
 
-if JDK4
+if WITH_JDK4
 CLASSPATH4=$(CLASSPATH4)
 JDK4=@ac_jdk4_path@
 JDK4_FLAGS=-O -g:none
@@ -130,7 +130,7 @@ stdclassfiles=$(stdjavafiles:%.java=%.class)
 std2: ../../virtjdbc2.jar
 
 ../../virtjdbc2.jar: outstd $(stdjavafiles) $(stdclassfiles)
-	@cd outstd ; $(JDK2)/bin/jar cf ../../../virtjdbc2.jar virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class
+	@cd outstd ; $(JDK2)/jar cf ../../../virtjdbc2.jar virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java 2.0 built"
 
 outstd:
@@ -144,15 +144,15 @@ outstd:
 
 outstd/virtuoso/jdbc2/%.class: outstd/virtuoso/jdbc2/%.java
 	@echo jdbc2 javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outstd ; $(JDK2)/bin/javac $(JDK2_FLAGS) -classpath . virtuoso/jdbc2/$(notdir $<)
+	@cd outstd ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . virtuoso/jdbc2/$(notdir $<)
 
 outstd/openlink/util/%.class: outstd/openlink/util/%.java
 	@echo jdbc2 util javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outstd ; $(JDK2)/bin/javac $(JDK2_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outstd ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outstd/virtuoso/sql/%.class: outstd/virtuoso/sql/%.java
 	@echo jdbc2 sql javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outstd ; $(JDK2)/bin/javac $(JDK2_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outstd ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outstd/virtuoso/jdbc2/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) $(jdbc2_defs) $< >$@
@@ -178,7 +178,7 @@ sslclassfiles=$(ssljavafiles:%.java=%.class)
 ssl2: ../../virtjdbc2ssl.jar
 
 ../../virtjdbc2ssl.jar: outssl $(ssljavafiles) $(sslclassfiles)
-	@cd outssl ; $(JDK2)/bin/jar cf ../../../virtjdbc2ssl.jar virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class
+	@cd outssl ; $(JDK2)/jar cf ../../../virtjdbc2ssl.jar virtuoso/jdbc2/*.class openlink/util/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java SSL 2.0 built"
 
 outssl:
@@ -191,15 +191,15 @@ outssl:
 
 outssl/virtuoso/jdbc2/%.class: outssl/virtuoso/jdbc2/%.java
 	@echo jdbc2 ssl javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outssl ; $(JDK2)/bin/javac -classpath ".$(CPS)$(jssljars)" $(JDK2_FLAGS) virtuoso/jdbc2/$(notdir $<)
+	@cd outssl ; $(JDK2)/javac -classpath ".$(CPS)$(jssljars)" $(JDK2_FLAGS) virtuoso/jdbc2/$(notdir $<)
 
 outssl/openlink/util/%.class: outssl/openlink/util/%.java
 	@echo jdbc2 ssl util javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outssl ; $(JDK2)/bin/javac $(JDK2_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outssl ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outssl/virtuoso/sql/%.class: outssl/virtuoso/sql/%.java
 	@echo jdbc2 ssl sql javac $(JDK2_FLAGS) $(notdir $<)
-	@cd outssl ; $(JDK2)/bin/javac $(JDK2_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outssl ; $(JDK2)/javac $(JDK2_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outssl/virtuoso/jdbc2/%.java: %.java
 	$(CPP) -P -DSSL $(JCPPOPTS) $(jdbc2_defs) $< >$@
@@ -233,7 +233,7 @@ std3classfiles=$(std3javafiles:%.java=%.class)
 std3: ../../virtjdbc3.jar
 
 ../../virtjdbc3.jar: outstd3 $(std3javafiles) $(std3classfiles)
-	@cd outstd3 ; $(JDK3)/bin/jar cf ../../../virtjdbc3.jar virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
+	@cd outstd3 ; $(JDK3)/jar cf ../../../virtjdbc3.jar virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java 3.0 built"
 
 outstd3:
@@ -248,19 +248,19 @@ outstd3:
 
 outstd3/virtuoso/jdbc3/%.class: outstd3/virtuoso/jdbc3/%.java
 	@echo jdbc3 javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outstd3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . virtuoso/jdbc3/$(notdir $<)
+	@cd outstd3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/jdbc3/$(notdir $<)
 
 outstd3/openlink/util/%.class: outstd3/openlink/util/%.java
 	@echo jdbc3 util javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outstd3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outstd3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outstd3/virtuoso/sql/%.class: outstd3/virtuoso/sql/%.java
 	@echo jdbc3 sql javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outstd3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outstd3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outstd3/virtuoso/javax/%.class: outstd3/virtuoso/javax/%.java
 	@echo jdbc3 javax javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outstd3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
+	@cd outstd3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
 
 outstd3/virtuoso/jdbc3/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) $(jdbc3_defs) $< >$@
@@ -291,7 +291,7 @@ ssl3classfiles=$(ssl3javafiles:%.java=%.class)
 ssl3: ../../virtjdbc3ssl.jar
 
 ../../virtjdbc3ssl.jar: outssl3 $(ssl3javafiles) $(ssl3classfiles)
-	@cd outssl3 ; $(JDK3)/bin/jar cf ../../../virtjdbc3ssl.jar virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
+	@cd outssl3 ; $(JDK3)/jar cf ../../../virtjdbc3ssl.jar virtuoso/jdbc3/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java SSL 3.0 built"
 
 outssl3:
@@ -305,19 +305,19 @@ outssl3:
 
 outssl3/virtuoso/jdbc3/%.class: outssl3/virtuoso/jdbc3/%.java
 	@echo jdbc3 ssl javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outssl3 ; $(JDK3)/bin/javac -classpath . $(JDK3_FLAGS) virtuoso/jdbc3/$(notdir $<)
+	@cd outssl3 ; $(JDK3)/javac -classpath . $(JDK3_FLAGS) virtuoso/jdbc3/$(notdir $<)
 
 outssl3/openlink/util/%.class: outssl3/openlink/util/%.java
 	@echo jdbc3 ssl util javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outssl3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outssl3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outssl3/virtuoso/sql/%.class: outssl3/virtuoso/sql/%.java
 	@echo jdbc3 ssl sql javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outssl3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outssl3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outssl3/virtuoso/javax/%.class: outssl3/virtuoso/javax/%.java
 	@echo jdbc3 ssl javax javac $(JDK3_FLAGS) $(notdir $<)
-	@cd outssl3 ; $(JDK3)/bin/javac $(JDK3_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
+	@cd outssl3 ; $(JDK3)/javac $(JDK3_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
 
 outssl3/virtuoso/jdbc3/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) -DSSL $(jdbc3_defs) $< >$@
@@ -355,7 +355,7 @@ std4classfiles=$(std4javafiles:%.java=%.class)
 std4: ../../virtjdbc4.jar
 
 ../../virtjdbc4.jar: outstd4 $(std4javafiles) $(std4classfiles)
-	@cd outstd4 ; $(JDK4)/bin/jar cf ../../../virtjdbc4.jar virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
+	@cd outstd4 ; $(JDK4)/jar cf ../../../virtjdbc4.jar virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java 4.0 built"
 
 outstd4:
@@ -370,19 +370,19 @@ outstd4:
 
 outstd4/virtuoso/jdbc4/%.class: outstd4/virtuoso/jdbc4/%.java
 	@echo jdbc4 javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outstd4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . virtuoso/jdbc4/$(notdir $<)
+	@cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/jdbc4/$(notdir $<)
 
 outstd4/openlink/util/%.class: outstd4/openlink/util/%.java
 	@echo jdbc4 util javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outstd4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outstd4/virtuoso/sql/%.class: outstd4/virtuoso/sql/%.java
 	@echo jdbc4 sql javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outstd4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outstd4/virtuoso/javax/%.class: outstd4/virtuoso/javax/%.java
 	@echo jdbc4 javax javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outstd4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
+	@cd outstd4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
 
 outstd4/virtuoso/jdbc4/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) $(jdbc4_defs) $< >$@
@@ -415,7 +415,7 @@ ssl4classfiles=$(ssl4javafiles:%.java=%.class)
 ssl4: ../../virtjdbc4ssl.jar
 
 ../../virtjdbc4ssl.jar: outssl4 $(ssl4javafiles) $(ssl4classfiles)
-	@cd outssl4 ; $(JDK4)/bin/jar cf ../../../virtjdbc4ssl.jar virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
+	@cd outssl4 ; $(JDK4)/jar cf ../../../virtjdbc4ssl.jar virtuoso/jdbc4/*.class openlink/util/*.class virtuoso/javax/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java SSL 4.0 built"
 
 outssl4:
@@ -429,19 +429,19 @@ outssl4:
 
 outssl4/virtuoso/jdbc4/%.class: outssl4/virtuoso/jdbc4/%.java
 	@echo jdbc4 ssl javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outssl4 ; $(JDK4)/bin/javac -classpath . $(JDK4_FLAGS) virtuoso/jdbc4/$(notdir $<)
+	@cd outssl4 ; $(JDK4)/javac -classpath . $(JDK4_FLAGS) virtuoso/jdbc4/$(notdir $<)
 
 outssl4/openlink/util/%.class: outssl4/openlink/util/%.java
 	@echo jdbc4 ssl util javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outssl4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . openlink/util/$(notdir $<)
+	@cd outssl4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . openlink/util/$(notdir $<)
 
 outssl4/virtuoso/sql/%.class: outssl4/virtuoso/sql/%.java
 	@echo jdbc4 ssl sql javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outssl4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
+	@cd outssl4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/sql/$(notdir $<)
 
 outssl4/virtuoso/javax/%.class: outssl4/virtuoso/javax/%.java
 	@echo jdbc4 ssl javax javac $(JDK4_FLAGS) $(notdir $<)
-	@cd outssl4 ; $(JDK4)/bin/javac $(JDK4_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
+	@cd outssl4 ; $(JDK4)/javac $(JDK4_FLAGS) -classpath . virtuoso/javax/$(notdir $<)
 
 outssl4/virtuoso/jdbc4/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) -DSSL $(jdbc4_defs) $< >$@
@@ -473,7 +473,7 @@ std1classfiles=$(std1javafiles:%.java=%.class)
 std1: ../../virtjdbc.jar
 
 ../../virtjdbc.jar: outstd1 $(std1javafiles) $(std1classfiles)
-	@cd outstd1 ; $(JDK1)/bin/jar cf ../../../virtjdbc.jar virtuoso/jdbc/*.class openlink/util/*.class virtuoso/sql/*.class
+	@cd outstd1 ; $(JDK1)/jar cf ../../../virtjdbc.jar virtuoso/jdbc/*.class openlink/util/*.class virtuoso/sql/*.class
 	@echo "............. Virtuoso pure Java 1.0 built"
 
 outstd1:
@@ -487,15 +487,15 @@ outstd1:
 
 outstd1/virtuoso/jdbc/%.class: outstd1/virtuoso/jdbc/%.java
 	@echo jdbc1 javac $(JDK1_FLAGS) $(notdir $<)
-	@cd outstd1 ; $(JDK1)/bin/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip virtuoso/jdbc/$(notdir $<)
+	@cd outstd1 ; $(JDK1)/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip virtuoso/jdbc/$(notdir $<)
 
 outstd1/openlink/util/%.class: outstd1/openlink/util/%.java
 	@echo jdbc1 util javac $(JDK1_FLAGS) $(notdir $<)
-	@cd outstd1 ; $(JDK1)/bin/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip openlink/util/$(notdir $<)
+	@cd outstd1 ; $(JDK1)/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip openlink/util/$(notdir $<)
 
 outstd1/virtuoso/sql/%.class: outstd1/virtuoso/sql/%.java
 	@echo jdbc1 sql javac $(JDK1_FLAGS) $(notdir $<)
-	@cd outstd1 ; $(JDK1)/bin/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip virtuoso/sql/$(notdir $<)
+	@cd outstd1 ; $(JDK1)/javac $(JDK1_FLAGS) -classpath .:$(JDK1)/lib/classes.zip virtuoso/sql/$(notdir $<)
 
 outstd1/virtuoso/jdbc/%.java: %.java
 	$(CPP) -P $(JCPPOPTS) $(jdbc1_defs) $< >$@
diff --git a/libsrc/Thread/sched_pthread.c b/libsrc/Thread/sched_pthread.c
index 781bed6a85..3dde089185 100644
--- a/libsrc/Thread/sched_pthread.c
+++ b/libsrc/Thread/sched_pthread.c
@@ -243,6 +243,9 @@ thread_initial (unsigned long stack_size)
   stack_size *= 2;
 #endif
 
+
+  stack_size = ((stack_size / 1024) + 1) * 1024;
+
   thr->thr_stack_size = stack_size;
   thr->thr_status = RUNNING;
   thr->thr_cv = _alloc_cv ();
@@ -339,7 +342,7 @@ thread_create (
   stack_size += 8 * 8192;
 #endif
 
-  stack_size = (stack_size / 1024 + 1) * 1024;
+  stack_size = ((stack_size / 1024) + 1) * 1024;
 
 #if defined (PTHREAD_STACK_MIN)
   if (stack_size < PTHREAD_STACK_MIN)
@@ -383,7 +386,7 @@ thread_create (
 
 
 #ifndef OLD_PTHREADS
-# if  !defined (linux) && !defined (__APPLE__) /* not in redhat 5 */
+# if  defined(HAVE_PTHREAD_ATTR_SETSTACKSIZE)
       rc = pthread_attr_setstacksize (&_thread_attr, stack_size);
       if (rc)
 	{
@@ -391,7 +394,7 @@ thread_create (
 	}
 # endif
 
-#if !defined (SOLARIS)
+#if defined(HAVE_PTHREAD_ATTR_GETSTACKSIZE)
       if (0 == pthread_attr_getstacksize (&_thread_attr, &os_stack_size))
 	{
 	  if (os_stack_size > 4 * 8192)
@@ -418,7 +421,7 @@ thread_create (
       /* rc = pthread_detach (*(pthread_t *) thr->thr_handle); */
       /* CKRET (rc); */
 
-#else
+#else /* OLD_PTHREAD */
       rc = pthread_attr_setstacksize (&_thread_attr, stack_size);
       CKRET (rc);