diff --git a/CASA/Makefile.am b/CASA/Makefile.am
index 153aad0f..8e70abd3 100644
--- a/CASA/Makefile.am
+++ b/CASA/Makefile.am
@@ -26,10 +26,10 @@ TARGET_CFG = Release
 endif
 
 if LINUX
-SUBDIRS = micasacache common micasadk micasad/lib  sharp  \
+SUBDIRS = micasacache common micasadk micasad/lib sharp cli  \
 	policy adlib micasad gui logincapture jwrapper package
 
-DIST_SUBDIRS = micasacache common micasadk micasad sharp  \
+DIST_SUBDIRS = micasacache common micasadk micasad sharp cli \
 	policy adlib gui logincapture jwrapper package
 endif
 
@@ -38,7 +38,7 @@ SUBDIRS = package
 DIST_SUBDIRS = micasacache common micasadk jwrapper  package
 endif
 
-EXTRA_DIST = include include/*.h \
+EXTRA_DIST = include include/*.h  cli/* \
 	     doc/internal/*.doc doc/internal/*.xsd \
              doc/product/*.pdf doc/product/*.txt \
 	     readme-folder/readme*  autogen.sh 
diff --git a/CASA/cli/Makefile.am b/CASA/cli/Makefile.am
new file mode 100644
index 00000000..6a68ac32
--- /dev/null
+++ b/CASA/cli/Makefile.am
@@ -0,0 +1,117 @@
+#######################################################################
+#
+#  Copyright (C) 2006 Novell, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+#######################################################################
+
+if DEBUG
+TARGET_CFG = Debug
+CFLAGS += -v -w
+CS_EXTRA_FLAGS = $(CSCFLAGS_DEBUG)  
+else
+TARGET_CFG = Release
+endif
+
+SUBDIRS =
+DIST_SUBDIRS =  
+
+EXTRA_DIST = $(CSFILES) CASAUtil.* h
+
+#EXTRA_DIST = $(CSFILES) help/en  help/en/*.htm  help/en/*.gif \
+#	     images/*.png images/*.ico images/*.glade* \
+#	     images/*.bmp 
+
+CASAROOT = ..
+
+CASALIBDIR = $(CASAROOT)/$(LIB)/$(TARGET_CFG)
+
+if LIB64 
+CASABINDIR = $(CASAROOT)/bin64
+else
+CASABINDIR = $(CASAROOT)/bin
+endif
+
+# handle Mono secondary dependencies
+export MONO_PATH := $(MONO_PATH)
+
+PLATFORMINDEPENDENTSOURCEDIR =
+PLATFORMDEPENDENTSOURCEDIR = .
+
+MODULE_NAME =CASAUtil
+MODULE_EXT =exe
+
+CSFILES =$(srcdir)/CASAUtil.cs 
+
+CSFILES_CSC := $(subst /,$(SEP),$(CSFILES))
+CS_FLAGS = -d:LINUX -nowarn:169 
+CS_RESOURCES =
+CS_LIBS = $(CASALIBDIR)/Novell.CASA.miCASAWrapper.dll
+
+CS_LIBPATH = ../c_micasad/test/dependencies  \
+	$(CASALIBDIR) 
+
+OBJDIR = ./$(TARGET_CFG)/$(LIB)
+
+#OBJS = $(addprefix $(OBJDIR)/, $(CSFILES:%.dll=%.cs))
+
+CUR_DIR := $(shell pwd)
+
+all: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
+
+#
+# Pattern based rules.
+#
+vpath %.c $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR)
+vpath %.cpp $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR)
+vpath %.cs $(PLATFORMDEPENDENTSOURCEDIR) $(PLATFORMINDEPENDENTSOURCEDIR)
+
+$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(CSFILES) 
+	$(CSC) $(CS_FLAGS) $(CS_EXTRA_FLAGS) $(CS_LIBPATH:%=-lib:%) $(CS_LIBS:%=/r:%) -out:$@ $(CSFILES_CSC) 
+	cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASABINDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
+
+#$(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT): $(OBJDIR) $(OBJS)
+#	@echo [======== Linking $@ ========]
+#	$(LINK) -o $@ $(LDFLAGS) $(OBJS) $(LIBS)
+#	cp -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(CASALIBDIR)/$(TARGET_CFG)/$(MODULE_NAME).$(MODULE_EXT)
+
+$(OBJDIR):
+	[ -d $(OBJDIR) ] || mkdir -p $(OBJDIR)
+	[ -d $(CASABINDIR) ] || mkdir -p $(CASABINDIR)
+	[ -d $(CASABINDIR)/$(TARGET_CFG) ] || mkdir -p $(CASABINDIR)/$(TARGET_CFG)
+
+
+install-exec-local: $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	$(INSTALL_PROGRAM) $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT) $(DESTDIR)$(libdir)/
+
+uninstall-local:
+	cd $(DESTDIR)$(libdir); rm -f $(OBJDIR)/$(MODULE_NAME).$(MODULE_EXT)
+	rmdir $(DESTDIR)$(libdir)
+
+#installcheck-local: install
+#	$(mkinstalldirs) $(DESTDIR)$(libdir)
+#	$(INSTALL_PROGRAM) $(DESTDIR)$(libdir)
+#	cd $(DESTDIR)$(libdir); $(MONO)
+
+clean-local:
+	if [ -d $(TARGET_CFG) ]; then  rm -rf $(TARGET_CFG); fi
+
+distclean-local:
+
+maintainer-clean-local:
+	rm -f Makefile.in
diff --git a/CASA/configure.in b/CASA/configure.in
index 6c7f1ca6..c71cae1e 100644
--- a/CASA/configure.in
+++ b/CASA/configure.in
@@ -299,6 +299,7 @@ micasad/startup/Makefile
 sharp/Makefile
 sharp/NSSCSWrapper/Makefile
 micasad/Makefile
+cli/Makefile
 policy/Makefile
 adlib/ad_kw/Makefile
 adlib/ad_gk/native/Makefile
diff --git a/CASA/package/linux/CASA.spec.in b/CASA/package/linux/CASA.spec.in
index 16c2048a..82082f6d 100644
--- a/CASA/package/linux/CASA.spec.in
+++ b/CASA/package/linux/CASA.spec.in
@@ -118,6 +118,7 @@ install -m 755 %{_lib}/%{cfg}/Novell.CASA.DataEngines.FireFox.dll %{buildroot}%{
 install -m 755 %{binsource}/%{cfg}/micasad.exe %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/%{cfg}/micasad-init %{buildroot}%{bin_prefix}/bin
 install -m 755 %{binsource}/%{cfg}/CASAManager.exe %{buildroot}%{bin_prefix}/bin 
+install -m 755 %{binsource}/%{cfg}/CASAUtil.exe %{buildroot}%{bin_prefix}/bin 
 install -m 755 gui/CASAManager.sh %{buildroot}%{bin_prefix}/bin
 install -m 755 gui/CASAManager.exe.config %{buildroot}%{bin_prefix}/bin
 install -m 644 gui/images/* %{buildroot}%{prefix}/CASA/images
@@ -234,6 +235,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/CASA/doc/License.txt
 %{prefix}/CASA/doc/Readme.txt
 
+%{bin_prefix}/bin/CASAUtil.exe
 
 %files devel 
 %defattr(-,root,root)