diff --git a/CMakeLists.txt b/CMakeLists.txt
index adfe4ce0a..c27bc632b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,9 +67,10 @@ set(YAP_ROOTDIR ${prefix})
 # erootdir -> rootdir
 # bindir defined above
 # libdir defined above
-set(YAP_LIBDIR "${dlls}")
-set(YAP_SHAREDIR "${datarootdir}")
-set(YAP_BINDIR "${bindir}")
+set(YAP_LIB_DIR "${dlls}")
+set(YAP_SHARE_DIR "${datarootdir}")
+set(YAP_BIN_DIR "${bindir}")
+set(YAP_INCLUDE_DIR "${includedir}")
 set(YAP_ROOTDIR "${prefix}")
 
 set(YAP_YAPLIB libYap${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/Makefile.in b/Makefile.in
index cfc096c6b..692c737d7 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -439,7 +439,7 @@ BEAM_OBJECTS = \
 STATIC_OBJECTS = \
 	@STATIC_MODE@sys.o yap_random.o regexp.o  @NO_BUILTIN_REGEXP@ regcomp.o regerror.o regfree.o regexec.o
 
-LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS) $(LIBTAI_OBJECTS)  $(JIT_OBJECTS) 
+LIB_OBJECTS = $(ENGINE_OBJECTS) $(C_INTERFACE_OBJECTS) $(OR_OBJECTS) $(BEAM_OBJECTS) $(STATIC_OBJECTS) $(LIBTAI_OBJECTS)  $(JIT_OBJECTS)
 
 OBJECTS = yap.o yapi.o $(LIB_OBJECTS)
 
@@ -598,7 +598,7 @@ all: startup.yss
 	-rm -f startup.yss
 	echo "bootstrap('$(srcdir)/pl/init.yap'). module(user). qsave_program('startup.yss')." |  @PRE_INSTALL_ENV@ ./yap@EXEC_SUFFIX@ -b $(srcdir)/pl/boot.yap
 
-yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@ libYap.a 
+yap@EXEC_SUFFIX@: $(HEADERS) yap.o @YAPLIB@ libYap.a
 	$(MPI_CC) $(EXECUTABLE_CFLAGS) $(LDFLAGS) -o yap@EXEC_SUFFIX@ yap.o @YAPLIB@ $(LIBS) $(PAPILIB) $(JITLIBS) $(JITLD)
 
 yap-win: yap-win@EXEC_SUFFIX@
@@ -606,7 +606,7 @@ yap-win: yap-win@EXEC_SUFFIX@
 yapwin: yap-win@EXEC_SUFFIX@
 
 yap-win@EXEC_SUFFIX@: $(PLCONS_OBJECTS) $(HEADERS) @YAPLIB@
-	$(MAKE) -C swi/console 
+	$(MAKE) -C swi/console
 	$(MPI_CC) -municode -DUNICODE -D_UNICODE $(EXECUTABLE_CFLAGS) $(LDFLAGS) -Wl,-subsystem,windows -o yap-win@EXEC_SUFFIX@ $(PLCONS_OBJECTS) plterm.dll @YAPLIB@ $(LIBS) -lgdi32 @MPILDF@
 
 libYap.a: $(LIB_OBJECTS) yapi.o
@@ -625,18 +625,23 @@ libYap.a: $(LIB_OBJECTS) yapi.o
 	adb shell mkdir -p /data/yap
 	adb shell mkdir -p /data/yap/pl
 	adb shell mkdir -p /data/yap/swi/library
+	adb shell mkdir -p /data/yap/packages
+	adb shell mkdir -p /data/yap/packages/chr
+	adb shell mkdir -p /data/yap/packages/clib
 	adb push yap /data/yap/
 	adb push @DYNYAPLIB@ /data/yap/
 	for p in $(EXTRAYAPLIBS); do \
 	  adb shell $(LN_S) /data/yap/@DYNYAPLIB@ /data/yap/$$p; \
 	done
 	adb push $(GMPDIR)/lib/libgmp.so /data/yap
+	#adb push packages/clib/*.so /data/yap
+	#adb push library/system/*.so /data/yap
 	adb push $(srcdir)/swi/library /data/yap/swi/library
 	adb push $(srcdir)/pl /data/yap/pl/
 	adb push $(srcdir)/library /data/yap/library/
 	adb shell "echo \"bootstrap('/data/yap/pl/init.yap'). module(user). qsave_program('/data/yap/startup.yss').\" | LD_LIBRARY_PATH=/data/yap /data/yap/yap@EXEC_SUFFIX@ -b /data/yap/pl/boot.yap"
 	adb pull /data/yap/startup.yss
-	adb shell rm -rf /data/yap
+	#adb shell rm -rf /data/yap
 
 install: @INSTALL_COMMAND@ install_startup install_common
 
@@ -649,7 +654,7 @@ install_unix: @YAPLIB@ yap@EXEC_SUFFIX@
 	$(INSTALL_PROGRAM) -m 755 yap@EXEC_SUFFIX@ $(DESTDIR)$(BINDIR)/yap
 	$(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
 
-install_startup: startup.yss 
+install_startup: startup.yss
 	$(INSTALL_DATA) startup.yss $(DESTDIR)$(YAPLIBDIR)/startup.yss
 
 install_win32: startup.yss @WINDOWS@ yap-win@EXEC_SUFFIX@
diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
index 729e1f55f..8e2319968 100644
--- a/cmake/FindSqlite3.cmake
+++ b/cmake/FindSqlite3.cmake
@@ -1,56 +1,88 @@
-# - find Sqlite 3
-# SQLITE3_INCLUDE_DIR - Where to find Sqlite 3 header files (directory)
-# SQLITE3_LIBRARIES - Sqlite 3 libraries
-# SQLITE3_LIBRARY_RELEASE - Where the release library is
-# SQLITE3_LIBRARY_DEBUG - Where the debug library is
-# SQLITE3_FOUND - Set to TRUE if we found everything (library, includes and executable)
-
-# Copyright (c) 2010 Pau Garcia i Quiles, <pgquiles@elpauer.org>
+# - Try to find Sqlite3
+# Once done this will define
 #
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#  SQLITE3_FOUND - system has Sqlite3
+#  SQLITE3_INCLUDE_DIRS - the Sqlite3 include directory
+#  SQLITE3_LIBRARIES - Link these to use Sqlite3
+#  SQLITE3_DEFINITIONS - Compiler switches required for using Sqlite3
+#
+#  Copyright (c) 2008 Andreas Schneider <mail@cynapses.org>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 #
-# Generated by CModuler, a CMake Module Generator - http://gitorious.org/cmoduler
 
-IF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG )
-  SET(SQLITE3_FIND_QUIETLY TRUE)
-ENDIF( SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY_RELEASE AND SQLITE3_LIBRARY_DEBUG )
 
-FIND_PATH( SQLITE3_INCLUDE_DIR sqlite3.h  )
+if (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
+  # in cache already
+  set(SQLITE3_FOUND TRUE)
+else (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
+  # use pkg-config to get the directories and then use these values
+  # in the FIND_PATH() and FIND_LIBRARY() calls
+  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    include(UsePkgConfig)
+    pkgconfig(sqlite3 _SQLITE3_INCLUDEDIR _SQLITE3_LIBDIR _SQLITE3_LDFLAGS _SQLITE3_CFLAGS)
+  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+    find_package(PkgConfig)
+    if (PKG_CONFIG_FOUND)
+      pkg_check_modules(_SQLITE3 sqlite3)
+    endif (PKG_CONFIG_FOUND)
+  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
+  find_path(SQLITE3_INCLUDE_DIR
+    NAMES
+    sqlite3.h
+    PATHS
+    ${_SQLITE3_INCLUDEDIR}
+    /usr/local/opt/sqlite/include
+    /usr/include
+    /usr/local/include
+    /opt/local/include
+    /sw/include
+    )
 
-FIND_LIBRARY(SQLITE3_LIBRARY_RELEASE NAMES sqlite3 )
+  find_library(SQLITE3_LIBRARY
+    NAMES
+    sqlite3
+    PATHS
+    ${_SQLITE3_LIBDIR}
+    /usr/local/opt/sqlite
+    /usr/lib
+    /usr/local/lib
+    /opt/local/lib
+    /sw/lib
+    )
 
-FIND_LIBRARY(SQLITE3_LIBRARY_DEBUG NAMES sqlite3 sqlite3d  HINTS /usr/lib/debug/usr/lib/ )
+  if (SQLITE3_LIBRARY)
+    set(SQLITE3_FOUND TRUE)
+  endif (SQLITE3_LIBRARY)
 
-IF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR )
-  SET( SQLITE3_FOUND TRUE )
-ENDIF( SQLITE3_LIBRARY_RELEASE OR SQLITE3_LIBRARY_DEBUG AND SQLITE3_INCLUDE_DIR )
+  set(SQLITE3_INCLUDE_DIRS
+    ${SQLITE3_INCLUDE_DIR}
+    )
 
-IF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
-  # if the generator supports configuration types then set
-  # optimized and debug libraries, or if the CMAKE_BUILD_TYPE has a value
-  IF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-    SET( SQLITE3_LIBRARIES optimized ${SQLITE3_LIBRARY_RELEASE} debug ${SQLITE3_LIBRARY_DEBUG} )
-  ELSE( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-    # if there are no configuration types and CMAKE_BUILD_TYPE has no value
-    # then just use the release libraries
-    SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} )
-  ENDIF( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-ELSEIF( SQLITE3_LIBRARY_RELEASE )
-  SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_RELEASE} )
-ELSE( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
-  SET( SQLITE3_LIBRARIES ${SQLITE3_LIBRARY_DEBUG} )
-ENDIF( SQLITE3_LIBRARY_DEBUG AND SQLITE3_LIBRARY_RELEASE )
+  if (SQLITE3_FOUND)
+    set(SQLITE3_LIBRARIES
+      ${SQLITE3_LIBRARIES}
+      ${SQLITE3_LIBRARY}
+      )
+  endif (SQLITE3_FOUND)
 
-IF( SQLITE3_FOUND )
-  IF( NOT SQLITE3_FIND_QUIETLY )
-    MESSAGE( STATUS "Found Sqlite3 header file in ${SQLITE3_INCLUDE_DIR}")
-    MESSAGE( STATUS "Found Sqlite3 libraries: ${SQLITE3_LIBRARIES}")
-  ENDIF( NOT SQLITE3_FIND_QUIETLY )
-ELSE(SQLITE3_FOUND)
-  IF( SQLITE3_FIND_REQUIRED)
-    MESSAGE( FATAL_ERROR "Could not find Sqlite3" )
-  ELSE( SQLITE3_FIND_REQUIRED)
-    MESSAGE( STATUS "Optional package Sqlite3 was not found" )
-  ENDIF( SQLITE3_FIND_REQUIRED)
-ENDIF(SQLITE3_FOUND)
+  if (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
+    set(SQLITE3_FOUND TRUE)
+  endif (SQLITE3_INCLUDE_DIRS AND SQLITE3_LIBRARIES)
+
+  if (SQLITE3_FOUND)
+    if (NOT Sqlite3_FIND_QUIETLY)
+      message(STATUS "Found Sqlite3: ${SQLITE3_LIBRARIES}")
+    endif (NOT Sqlite3_FIND_QUIETLY)
+  else (SQLITE3_FOUND)
+    if (Sqlite3_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Sqlite3")
+    endif (Sqlite3_FIND_REQUIRED)
+  endif (SQLITE3_FOUND)
+
+  # show the SQLITE3_INCLUDE_DIRS and SQLITE3_LIBRARIES variables only in the advanced view
+  mark_as_advanced(SQLITE3_INCLUDE_DIRS SQLITE3_LIBRARIES)
+
+endif (SQLITE3_LIBRARIES AND SQLITE3_INCLUDE_DIRS)
diff --git a/config.h.in b/config.h.in
index ae4559aed..bdbb06efe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -406,6 +406,9 @@
 /* Define to 1 if you have the `nss_files' library (-lnss_files). */
 #undef HAVE_LIBNSS_FILES
 
+/* Define to 1 if you have the <libpq-fe.h> header file. */
+#undef HAVE_LIBPQ_FE_H
+
 /* Define to 1 if you have the `psapi' library (-lpsapi). */
 #undef HAVE_LIBPSAPI
 
diff --git a/configure b/configure
index 518ac62e1..127757ec4 100755
--- a/configure
+++ b/configure
@@ -906,6 +906,7 @@ enable_myddas
 with_mysql
 with_odbc
 with_sqlite3
+with_postgres
 enable_myddas_stats
 enable_myddas_top_level
 enable_jit
@@ -1606,6 +1607,7 @@ Optional Packages:
  --with-mysql[=DIR]      with the MYSQL library
  --with-odbc[=DIR]      with an ODBC library
  --with-sqlite3[=DIR]      with an SQLITE3 library
+ --with-postgres[=DIR]      with an POSTGRES library
 
   --without-time		  Exclude alarm library
  --with-libarchive=DIR              libarchive package
@@ -10400,6 +10402,24 @@ else
 fi
 
 
+
+# Check whether --with-postgres was given.
+if test "${with_postgres+set}" = set; then :
+  withval=$with_postgres; if test "$withval" = yes; then
+		yap_cv_postgres=/usr
+	elif test "$withval" = no; then
+		yap_cv_postgres=no
+	else
+		yap_cv_postgres=$withval
+		LDFLAGS="$LDFLAGS -L${yap_cv_postgres}/lib "
+		CPPFLAGS="$CPPFLAGS -I${yap_cv_postgres}/include "
+		MYDDAS_CPPFLAGS="$MYDDAS_CPPFLAGS -I${yap_cv_postgres}/include "
+	fi
+else
+  yap_cv_postgres=/usr
+fi
+
+
 # Check whether --enable-myddas-stats was given.
 if test "${enable_myddas_stats+set}" = set; then :
   enableval=$enable_myddas_stats; if test "$yap_cv_myddas" = no; then
@@ -10797,6 +10817,69 @@ done
 		YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_SQLITE3"
 	fi
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdbParams in -lpq" >&5
+$as_echo_n "checking for PQconnectdbParams in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQconnectdbParams+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpq  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char PQconnectdbParams ();
+int
+main ()
+{
+return PQconnectdbParams ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pq_PQconnectdbParams=yes
+else
+  ac_cv_lib_pq_PQconnectdbParams=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQconnectdbParams" >&5
+$as_echo "$ac_cv_lib_pq_PQconnectdbParams" >&6; }
+if test "x$ac_cv_lib_pq_PQconnectdbParams" = xyes; then :
+  LIBS="-lpq $LIBS"
+                       havelib=yes
+fi
+
+
+        for ac_header in libpq-fe.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "libpq-fe.h" "ac_cv_header_libpq_fe_h" "$ac_includes_default"
+if test "x$ac_cv_header_libpq_fe_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ_FE_H 1
+_ACEOF
+
+else
+  yap_cv_postgres="no"
+fi
+
+done
+
+	if test "$yap_cv_postgres" != no
+	then
+	    use_myddas=true
+		YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_POSTGRES"
+	fi
+
+
 	if test "$myddasstats" = "yes"
 	  then
 	    YAP_EXTRAS="$YAP_EXTRAS -DMYDDAS_STATS"
@@ -14323,7 +14406,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 14326 "configure" */
+/* #line 14409 "configure" */
 public class Test {
 }
 EOF
@@ -14499,7 +14582,7 @@ EOF
 if uudecode$EXEEXT Test.uue; then
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 14502: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 14585: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
         ac_cv_prog_uudecode_base64=no
@@ -14630,7 +14713,7 @@ else
 JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 14633 "configure" */
+/* #line 14716 "configure" */
 public class Test {
 }
 EOF
@@ -14665,7 +14748,7 @@ JAVA_TEST=Test.java
 CLASS_TEST=Test.class
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 14668 "configure" */
+/* [#]line 14751 "configure" */
 public class Test {
 public static void main (String args[]) {
         System.exit (0);
diff --git a/packages/ProbLog/problog_examples/learn_graph_lbdd.pl b/packages/ProbLog/problog_examples/learn_graph_lbdd.pl
index b495c9b17..b0be6bf7d 100644
--- a/packages/ProbLog/problog_examples/learn_graph_lbdd.pl
+++ b/packages/ProbLog/problog_examples/learn_graph_lbdd.pl
@@ -14,7 +14,7 @@
 % will run 20 iterations of learning with default settings
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-:- use_module(library(problog)).
+:- use_module(library(problog_lbdd)).
 :- use_module(library(problog_learning_lbdd)).
 
 %%%%
diff --git a/packages/myddas/CMakeLists.txt b/packages/myddas/CMakeLists.txt
index d5850e779..7e8f7fddd 100644
--- a/packages/myddas/CMakeLists.txt
+++ b/packages/myddas/CMakeLists.txt
@@ -2,6 +2,8 @@
 set( MYDDAS_SOURCES
   myddas_mysql.c
   myddas_odbc.c
+  myddas_postgres.c
+  myddas_sqlite3.c
   myddas_util.c
   myddas_initialization.c
   myddas_shared.c
@@ -13,6 +15,8 @@ set( MYDDAS_PROLOG
   pl/myddas.ypp
   pl/myddas_assert_predicates.ypp
   pl/myddas_mysql.ypp
+  pl/myddas_sqlite3.ypp
+  pl/myddas_postgres.ypp
   pl/myddas_top_level.ypp
   pl/myddas_errors.ypp
   pl/myddas_prolog2sql.ypp
@@ -39,6 +43,7 @@ source_group(generated FILES ${GENERATED_SOURCES})
 macro_optional_find_package(ODBC ON)
 macro_optional_find_package(MySQL ON)
 macro_optional_find_package(Sqlite3 ON)
+macro_optional_find_package(PostgreSQL ON)
 
 macro_log_feature (ODBC_FOUND "ODBC"
     "Use ODBC Data-Base Interface "
@@ -48,11 +53,15 @@ macro_log_feature (MYSQL_FOUND "MySQL"
   "Use MYSQL Data-Base Interface "
   "http://www.mysql.org" FALSE)
 
-macro_log_feature (SQLITE3_FOUND "SQLite3"
-    "SQL Light Data-Base "
-"http://www.sqlite3.org" FALSE)
+  macro_log_feature (SQLITE3_FOUND "SQLite3"
+      "SQL Light Data-Base "
+  "http://www.sqlite3.org" FALSE)
 
-if (ODBC_FOUND OR MYSQL_FOUND OR SQLITE3_FOUND)
+  macro_log_feature (PostgreSQL_FOUND "PostgreSQL"
+      "PostgreSQL Data-Base "
+  "http://www.postgresql.org" FALSE)
+
+if (ODBC_FOUND OR MYSQL_FOUND OR SQLITE3_FOUND OR PostgreSQL_FOUND)
     add_definitions (-DUSE_MYDDAS=1)
   add_library (myddas SHARED ${MYDDAS_SOURCES})
   target_link_libraries(myddas libYap)
@@ -66,14 +75,13 @@ if (ODBC_FOUND OR MYSQL_FOUND OR SQLITE3_FOUND)
   endif (ODBC_FOUND)
 
   if (SQLITE3_FOUND)
-      # SQLITE3_INCLUDE_DIR - Where to find Sqlite 3 header files (directory)
-      # SQLITE3_LIBRARIES - Sqlite 3 libraries
-      # SQLITE3_LIBRARY_RELEASE - Where the release library is
-      # SQLITE3_LIBRARY_DEBUG - Where the debug library is
-      # SQLITE3_FOUND - Set to TRUE if we found everything (library, includes and executable)
-          add_definitions (-DMYDDAS_SQLITE3=1)
-      target_link_libraries(myddas ${SQLITE3_LIBRARIES})
-      include_directories (${SQLITE3_INCLUDE_DIR})
+    #  SQLITE3_FOUND - system has Sqlite3
+    #  SQLITE3_INCLUDE_DIRS - the Sqlite3 include directory
+    #  SQLITE3_LIBRARIES - Link these to use Sqlite3
+    #  SQLITE3_DEFINITIONS - Compiler switches required for using Sqlite3
+    add_definitions (-DMYDDAS_SQLITE3=1)
+    target_link_libraries(myddas ${SQLITE3_LIBRARIES})
+    include_directories (${SQLITE3_INCLUDE_DIRS})
   endif (SQLITE3_FOUND)
 
   if (MYSQL_FOUND)
@@ -85,6 +93,15 @@ if (ODBC_FOUND OR MYSQL_FOUND OR SQLITE3_FOUND)
     include_directories (${MYSQL_INCLUDE_DIR})
   endif (MYSQL_FOUND)
 
+  if (PostgreSQL_FOUND)
+    #  PostgreSQL_INCLUDE_DIRS  - Include directories for PostgreSQL
+    #  PostgreSQL_LIBRARY_DIRS  - Link directories for PostgreSQL libraries
+    #  PostgreSQL_LIBRARIES     - The PostgreSQL libraries.
+    add_definitions (-DMYDDAS_POSTGRES=1)
+    target_link_libraries(myddas ${PostgreSQL_LIBRARIES})
+    include_directories (${MYSQL_INCLUDE_DIRS})
+endif (PostgreSQL_FOUND)
+
   add_custom_target (plmyddas ALL DEPENDS ${GENERATED_SOURCES} ) # WORKING_DIRECTORY ${CMAKE_BINARY_DIR} )
 endif (ODBC_FOUND OR MYSQL_FOUND OR SQLITE3_FOUND)
 
diff --git a/packages/raptor b/packages/raptor
index 36f99e3c3..b36fdac22 160000
--- a/packages/raptor
+++ b/packages/raptor
@@ -1 +1 @@
-Subproject commit 36f99e3c3c978fef25f899dc4fab1ffee334d73c
+Subproject commit b36fdac2281b7eef141095375d81456410dbcd2f
diff --git a/packages/swig/Makefile.in b/packages/swig/Makefile.in
index d13253ec2..f95b101ec 100644
--- a/packages/swig/Makefile.in
+++ b/packages/swig/Makefile.in
@@ -26,7 +26,7 @@ JAVA_SQLITE="$(srcdir)/android/src/org"
 
 SQLITE=$(JNI_SQLITE) $(JAVA_SQLITE)
 
-PROSQLITE=$(srcdir)/../prosqlite/prolog/prosqlite.pl 
+PROSQLITE=$(srcdir)/../prosqlite/prolog/prosqlite.pl
 
 PYTHON_PROGRAMS = $(srcdir)/python/demo.py
 
@@ -100,20 +100,20 @@ android/jni/Android.mk: android/AndroidManifest.xml
 	cp -r $(YAP_EXPORT_DLLS)/*.so android/jni
 	cp -r $(YAP_EXPORT_SAVED_STATE) android/assets/lib/Yap
 	cp -r $(JNI_SQLITE) android/jni
-	cp -r $(JAVA_SQLITE) android/src 
+	cp -r $(JAVA_SQLITE) android/src
 	cp Android.mk android/jni
 
 android/AndroidManifest.xml: $(ANDROID_PKG)
-	android create project --target 1 --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap
+	android create project --target $(ANDROID_TARGET) --name JavaYap --path ./android --activity JavaYap --package pt.up.fc.dcc.yap
 	mkdir -p android/assets
 	mkdir -p android/assets/share
 	mkdir -p android/assets/share/Yap
 	mkdir -p android/assets/lib
-	mkdir -p android/assets/lib/Yap	
+	mkdir -p android/assets/lib/Yap
 	mkdir -p android/jni
 
-android/jni/yap_wrap.cpp: $(YAP_SWIG_INTERF) android/AndroidManifest.xml
-	$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir android/src/pt/up/fc/dcc/yap -o android/jni/yap_wrap.cpp $<
+android/jni/yap_wrap.cpp:  $(YAP_SWIG_INTERFACE) android/AndroidManifest.xml
+	$(SWIG) -c++ -java -I$(srcdir)/../../CXX -package pt.up.fc.dcc.yap -outdir android/src/pt/up/fc/dcc/yap -o $@ $<
 
 install-android: android
 	adb uninstall pt.up.fc.dcc.yap
@@ -124,7 +124,7 @@ R:
 
 yap.i: $(srcdir)/../../../../include/YapInterface.h
 
-install: 
+install:
 
 
 clean: