diff --git a/pw3270.spec.in b/pw3270.spec.in
index 2b3644d..1fc9994 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -28,7 +28,7 @@
 %define _office	  	0
 %define _php		0
 %define _ooRexx		1
-%define _java		1
+%define _java		0
 %define _python		1
 
 %define _distro		linux
@@ -484,9 +484,11 @@ rm -rf %{buildroot}
 %{_datadir}/@PACKAGE@/ui/98trace.xml
 %{_datadir}/@PACKAGE@/ui/99debug.xml
 %{_libdir}/lib@PACKAGE@.so
-%{_libdir}/@PACKAGE@class.a
 %{_libdir}/pkgconfig/@PACKAGE@.pc
 
+%{_libdir}/@PACKAGE@cpp.a
+%{_includedir}/@PACKAGE@cpp.h
+
 %dir %{_datadir}/@PACKAGE@/sample
 %{_datadir}/@PACKAGE@/sample/*
 
diff --git a/src/classlib/Makefile.in b/src/classlib/Makefile.in
index b062bd9..5470f22 100644
--- a/src/classlib/Makefile.in
+++ b/src/classlib/Makefile.in
@@ -25,7 +25,7 @@
 #
 
 PACKAGE=@PACKAGE_NAME@
-LIBNAME=$(PACKAGE)class.a
+LIBNAME=$(PACKAGE)cpp.a
 
 #---[ Sources ]----------------------------------------------------------------
 
@@ -92,8 +92,8 @@ $(BINRLS)/$(LIBNAME): $(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/$(SRC).
 	@ar rs $@ $^
 
 install: Release
-	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)
-	@$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(datarootdir)/$(PACKAGE)
+	@$(MKDIR) $(DESTDIR)$(libdir)
+	@$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(libdir)
 
 #---[ Debug targets ]----------------------------------------------------------
 
@@ -117,7 +117,8 @@ install-sdk: $(BINRLS)/$(LIBNAME)
 	@$(MKDIR) $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
 	@$(INSTALL_DATA) *.cc $(DESTDIR)$(datarootdir)/$(PACKAGE)/sample/classlib
 	@$(MKDIR) $(DESTDIR)/$(includedir)/pw3270
-	@$(INSTALL_DATA) ../include/pw3270/class.h $(DESTDIR)/$(includedir)/pw3270
+	@$(INSTALL_DATA) ../include/pw3270/class.h $(DESTDIR)/$(includedir)/pw3270 
+	@$(LN_S) ./pw3270/class.h $(DESTDIR)/$(includedir)/$(PACKAGE)cpp.h
 	@$(MKDIR) $(DESTDIR)$(libdir)
 	@$(INSTALL_DATA) $(BINRLS)/$(LIBNAME) $(DESTDIR)$(libdir)
 
--
libgit2 0.21.2