diff --git a/config/acx_libpq.m4 b/config/acx_libpq.m4
new file mode 100644
index 9b91f94..ec60eba
*** a/config/acx_libpq.m4
--- b/config/acx_libpq.m4
*************** if test "$with_pgport" = "yes"; then
*** 523,529 ****
     if test $HAVE_PGCOMMON = 1  ; then
         EXTRALIBS=" -lpgcommon"
     fi
!    LIBS="$LIBS -lpgport $EXTRALIBS"
     AC_TRY_LINK_FUNC(find_my_exec,[HAVE_PGPORT=1
                                    AC_MSG_RESULT(yes)], 
                      AC_MSG_ERROR("pgport was not found. build without --with-pgport=yes to disable"))
--- 523,529 ----
     if test $HAVE_PGCOMMON = 1  ; then
         EXTRALIBS=" -lpgcommon"
     fi
!    LIBS="$LIBS $EXTRALIBS -lpgport"
     AC_TRY_LINK_FUNC(find_my_exec,[HAVE_PGPORT=1
                                    AC_MSG_RESULT(yes)], 
                      AC_MSG_ERROR("pgport was not found. build without --with-pgport=yes to disable"))
diff --git a/src/slon/Makefile b/src/slon/Makefile
new file mode 100644
index a98693b..347d189
*** a/src/slon/Makefile
--- b/src/slon/Makefile
*************** slony_subdir = src/slon
*** 11,17 ****
  slony_top_builddir = ../..
  SLFILEDESC="Slony replication engine"
  include $(slony_top_builddir)/Makefile.global
! CPPFLAGS:=$(CPPFLAGS_CLIENT)
  SFILES=$(wildcard *.c)
  CC = $(PTHREAD_CC)
  
--- 11,21 ----
  slony_top_builddir = ../..
  SLFILEDESC="Slony replication engine"
  include $(slony_top_builddir)/Makefile.global
! ifeq ($(HAVE_PGPORT),1)
!  CPPFLAGS:=$(CPPFLAGS_SERVER) $(CPPFLAGS_CLIENT)
! else
!  CPPFLAGS:=$(CPPFLAGS_CLIENT)
! endif 
  SFILES=$(wildcard *.c)
  CC = $(PTHREAD_CC)
  
diff --git a/src/slon/remote_worker.c b/src/slon/remote_worker.c
new file mode 100644
index 48e86fc..24d0fbe
*** a/src/slon/remote_worker.c
--- b/src/slon/remote_worker.c
*************** sync_event(SlonNode * node, SlonConn * l
*** 3646,3652 ****
  	PerfMon		pm;
  
  	gettimeofday(&tv_start, NULL);
- 
  	slon_log(SLON_DEBUG2, "remoteWorkerThread_%d: SYNC " INT64_FORMAT
  			 " processing\n",
  			 node->no_id, event->ev_seqno);
--- 3646,3651 ----
diff --git a/src/slon/slon.h b/src/slon/slon.h
new file mode 100644
index c9f8831..cf7b0b0
*** a/src/slon/slon.h
--- b/src/slon/slon.h
***************
*** 22,27 ****
--- 22,28 ----
  #include "misc.h"
  #include "conf-file.h"
  #include "confoptions.h"
+ #include <postgres_fe.h>
  #include <pg_config.h>
  #ifdef WIN32
  #include <winsock2.h>
diff --git a/src/slonik/types.h b/src/slonik/types.h
new file mode 100644
index 1d4f18e..e5fbb58
*** a/src/slonik/types.h
--- b/src/slonik/types.h
***************
*** 1,5 ****
--- 1,6 ----
  #ifndef _TYPES_H
  #define _TYPES_H
+ #include <postgres_fe.h>
  #include <pg_config.h>
  
  
diff --git a/src/slony_logshipper/Makefile b/src/slony_logshipper/Makefile
new file mode 100644
index b35a0e5..d615bb0
*** a/src/slony_logshipper/Makefile
--- b/src/slony_logshipper/Makefile
*************** slony_subdir = src/slony_logshipper
*** 11,17 ****
--- 11,22 ----
  slony_top_builddir = ../..
  SLFILEDESC="Slony command interpreter"
  include $(slony_top_builddir)/Makefile.global
+ ifeq ($(HAVE_PGPORT),1)
+ CPPFLAGS:=$(CPPFLAGS_SERVER) $(CPPFLAGS_CLIENT)
+ else
  CPPFLAGS:=$(CPPFLAGS_CLIENT)
+ endif
+ 
  ifeq ($(PORTNAME), aix)
    CFLAGS += -D_LARGE_FILES
  endif