diff -u -r -N -p ./abiword-plugins_old/wp/impexp/Makefile ./abiword-plugins/wp/impexp/Makefile
--- ./abiword-plugins_old/wp/impexp/Makefile	2005-07-04 16:09:24.770079704 -0300
+++ ./abiword-plugins/wp/impexp/Makefile	2005-07-04 15:09:51.326325728 -0300
@@ -38,6 +38,7 @@ DIRS+= 	latex
 DIRS+= 	mif
 DIRS+= 	mswrite
 DIRS+= 	nroff
+DIRS+= 	OpenDocument
 DIRS+= 	OpenWriter
 DIRS+= 	pdb
 DIRS+= 	pdf
diff -u -r -N -p ./abiword-plugins_old/wp/impexp/OpenDocument/Makefile ./abiword-plugins/wp/impexp/OpenDocument/Makefile
--- ./abiword-plugins_old/wp/impexp/OpenDocument/Makefile	1969-12-31 21:00:00.000000000 -0300
+++ ./abiword-plugins/wp/impexp/OpenDocument/Makefile	2005-07-04 15:07:38.678491264 -0300
@@ -0,0 +1,68 @@
+#! gmake
+
+## AbiWord
+## Copyright (C) 1998 AbiSource, Inc.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+## 02111-1307, USA.
+
+ABI_ROOT:=$(shell pwd)/../../../../abi
+include $(ABI_ROOT)/src/config/abi_defs.mk
+
+DIRS=				xp
+
+LIBRARY_NAME=		AbiOpenDocument
+LIBRARY_VERSION=	$(ABI_VERSION)
+TARGETS=			$(PLUGIN)
+
+OBJS=				$(OBJDIR)/ie_exp_OpenDocument.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/ie_exp_OpenDocument_Sniffer.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/ie_impexp_OpenDocument.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/ie_imp_OpenDocument.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/ie_imp_OpenDocument_Sniffer.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_AccumulatorImpl.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_Common.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_Listener.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_ManifestWriter.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_MetaDataWriter.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_PageStyle.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_PicturesWriter.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_SettingsWriter.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_Style.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_StylesContainer.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_StylesWriter.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OO_WriterImpl.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OpenDocument_ContentStream_Listener.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OpenDocument_MetaStream_Listener.$(OBJ_SUFFIX)	\
+				$(OBJDIR)/OpenDocument_StylesStream_Listener.$(OBJ_SUFFIX)
+
+ifeq ($(ABI_FE), Win32)
+ifeq ($(OS_NAME), MINGW32)
+	EXTRA_LIBS+=  -lAbiWord.dll
+	EXTRA_LIBS+=  $(ABI_GSF_LIB)
+else
+	OS_LIBS= kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib uuid.lib comctl32.lib ole32.lib oleaut32.lib 
+	EXTRA_LIBS+=  $(BINDIR)/AbiWord.$(LIB_SUFFIX) 
+	EXTRA_LIBS+=  $(ABI_ROOT)/../libs/libgsf/libgsf.$(LIB_SUFFIX)
+	EXTRA_LIBS+=  $(ABI_ROOT)/../libs/glib-2.2/lib/glib-2.0.$(LIB_SUFFIX)
+	EXTRA_LIBS+=  $(ABI_ROOT)/../libs/glib-2.2/lib/gobject-2.0.$(LIB_SUFFIX)
+#	EXTRA_LIBS+=  $(OBJDIR)/libAbi_zlib_s.$(LIB_SUFFIX)
+	ABI_APPLIBS=  Abi_zlib
+endif
+endif
+
+include $(ABI_ROOT)/src/config/abi_rules.mk
+
+build:: $(TARGETS)
diff -u -r -N -p ./abiword-plugins_old/wp/impexp/OpenDocument/xp/Makefile ./abiword-plugins/wp/impexp/OpenDocument/xp/Makefile
--- ./abiword-plugins_old/wp/impexp/OpenDocument/xp/Makefile	1969-12-31 21:00:00.000000000 -0300
+++ ./abiword-plugins/wp/impexp/OpenDocument/xp/Makefile	2005-07-04 15:12:30.897067288 -0300
@@ -0,0 +1,58 @@
+#! gmake
+
+## AbiWord
+## Copyright (C) 1998 AbiSource, Inc.
+##
+## This program is free software; you can redistribute it and/or
+## modify it under the terms of the GNU General Public License
+## as published by the Free Software Foundation; either version 2
+## of the License, or (at your option) any later version.
+## 
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+## 
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+## 02111-1307, USA.
+
+ABI_ROOT:=$(shell pwd)/../../../../../abi
+include $(ABI_ROOT)/src/config/abi_defs.mk
+
+TARGETS=			$(OBJS)
+CPPSRCS= 			ie_exp_OpenDocument.cpp \
+                ie_exp_OpenDocument_Sniffer.cpp    \
+                ie_impexp_OpenDocument.cpp \
+                ie_imp_OpenDocument.cpp    \
+                ie_imp_OpenDocument_Sniffer.cpp    \
+                OO_AccumulatorImpl.cpp \
+                OO_Common.cpp  \
+                OO_Listener.cpp    \
+                OO_ManifestWriter.cpp  \
+                OO_MetaDataWriter.cpp  \
+                OO_PageStyle.cpp   \
+                OO_PicturesWriter.cpp  \
+                OO_SettingsWriter.cpp  \
+                OO_Style.cpp   \
+                OO_StylesContainer.cpp \
+                OO_StylesWriter.cpp    \
+                OO_WriterImpl.cpp  \
+                OpenDocument_ContentStream_Listener.cpp    \
+                OpenDocument_MetaStream_Listener.cpp   \
+                OpenDocument_StylesStream_Listener.cpp
+ifeq ($(ABI_FE), Win32)
+ifeq ($(OS_NAME), MINGW32)
+	INCLUDES+=	$(ABI_GSF_INC)
+else
+	OS_CFLAGS+=-GX
+	INCLUDES+=	-I$(ABI_ROOT)/../libs/glib-2.2.2/lib/glib-2.0/include
+	INCLUDES+=	-I$(ABI_ROOT)/../libs/glib-2.2.2/include/glib-2.0
+	INCLUDES+=	-I$(ABI_ROOT)/../libs/libgsf
+endif
+endif
+
+include $(ABI_ROOT)/src/config/abi_rules.mk
+
+build:: $(TARGETS)