diff -uNr ifolder.orig/src/common/libifolder/Makefile.am ifolder/src/common/libifolder/Makefile.am
--- ifolder.orig/src/common/libifolder/Makefile.am	2009-04-06 11:47:20.475212616 +0200
+++ ifolder/src/common/libifolder/Makefile.am	2009-04-06 11:49:30.729802612 +0200
@@ -15,7 +15,7 @@
 override CFLAGS =
 
 libifolderclient_la_SOURCES = \
- 	iFolderClientLib.c stdsoap2.h ifolder.c ifolder.h
+ 	iFolderClientLib.c ifolder.c ifolder.h
 
 libifolderclient_la_CFLAGS = \
 	$(SIMIAS_CLIENT_C_CFLAGS) \
@@ -28,18 +28,15 @@
 #	> $(srcdir)/env.h
 #	$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
 
-$(srcdir)/stdsoap2.h:
-	cp $(GSOAP_PATH)/stdsoap2.h $(srcdir)
-
 #$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.c $(IFOLDER_CLIENT_WSDL)
 
-$(srcdir)/iFolderClient.h: $(srcdir)/stdsoap2.h $(IFOLDER_CLIENT_WSDL)
-	$(GSOAP_PATH)/wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
+$(srcdir)/iFolderClient.h: $(IFOLDER_CLIENT_WSDL)
+	wsdl2h -c -o $@ $(IFOLDER_CLIENT_WSDL)
 
 $(srcdir)/iFolderClientLib.c: $(srcdir)/iFolderClient.h
 	> $(srcdir)/env.h
-	$(GSOAP_PATH)/soapcpp2 -c -penv $(srcdir)/env.h
-	$(GSOAP_PATH)/soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
+	soapcpp2 -c -penv $(srcdir)/env.h
+	soapcpp2 -c -n -piFolder $(srcdir)/iFolderClient.h
 
 install-exec-hook:
 if !WINDOWS
@@ -51,19 +48,17 @@
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/ifolder3
 	$(INSTALL_PROGRAM) iFolderStub.h $(DESTDIR)$(includedir)/ifolder3
 	$(INSTALL_PROGRAM) iFolder.nsmap $(DESTDIR)$(includedir)/ifolder3
-	$(INSTALL_PROGRAM) stdsoap2.h $(DESTDIR)$(includedir)/ifolder3
 	$(INSTALL_PROGRAM) iFolderH.h $(DESTDIR)$(includedir)/ifolder3
 	$(INSTALL_PROGRAM) ifolder.h $(DESTDIR)$(includedir)/ifolder3
 
 uninstall-local:
 	rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderStub.h
 	rm -f $(DESTDIR)$(includedir)/ifolder3/iFolder.nsmap
-	rm -f $(DESTDIR)$(includedir)/ifolder3/stdsoap2.h
 	rm -f $(DESTDIR)$(includedir)/ifolder3/iFolderH.h
 	rm -f $(DESTDIR)$(includedir)/ifolder3/ifolder.h
 
 clean-local:
-	rm -f stdsoap2.* *.xml iFolder* env* soap*
+	rm -f *.xml iFolder* env* soap*
 	rm -rf $(COMMON_CLEAN_FILES)
 	
 distclean-local: