diff --git a/Makefile.in b/Makefile.in
index 2bf40ba..47d22eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,7 +153,6 @@ install-sdk:
 	@$(INSTALL_DATA) src/include/lib3270.h $(DESTDIR)/$(includedir)
 	@$(INSTALL_DATA) src/include/lib3270/config.h $(DESTDIR)/$(includedir)/lib3270
 	@$(INSTALL_DATA) src/include/lib3270/selection.h $(DESTDIR)/$(includedir)/lib3270
-	@$(INSTALL_DATA) src/include/pw3270.h $(DESTDIR)/$(includedir)/$(PACKAGE_NAME).h
 
 clean:
 	@rm -fr .obj
diff --git a/configure.ac b/configure.ac
index dd7e680..721a5bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,16 +196,11 @@ fi
 #--[ Options ]------------------------------------------------------------------------------------------------------------------------------------------------
 
 AC_ARG_ENABLE([pic],
-	[AS_HELP_STRING([--enable-pic], [enable support for PIC libraries (required to compile PW3270 on some systems)])],
+	[AS_HELP_STRING([--disable-pic], [disable support for PIC libraries (required to compile PW3270 on some systems)])],
 [
 	app_cv_pic="$enableval"
 ],[
-
-	if test "$host_cpu" = "x86_64"; then
-		app_cv_pic="yes"
-	else
-		app_cv_pic="no"
-	fi
+	app_cv_pic="yes"
 ])
 
 if test "$app_cv_pic" == "yes"; then
diff --git a/pw3270.spec.in b/pw3270.spec.in
index 94ce2e3..2395678 100644
--- a/pw3270.spec.in
+++ b/pw3270.spec.in
@@ -70,22 +70,32 @@ any IBM host that supports 3270-style connections over TELNET.
 
 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 
-%package lib
+%package devel
+Summary:	Files required for development of %{name} plugins
+Group:		Development/Libraries/C and C++
+Requires:	%{name} = @PACKAGE_VERSION@
+
+%description devel
+Development files for %{name}
+
+Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
+
+%package -n lib3270
 Summary:	3270 Communication library for %{name}
-Group:		Development/Libraries
-Requires:       openssl %{name}-lib
+Group:		Development/Libraries/C and C++
+Requires:       openssl
 
-%description lib
+%description -n lib3270
 tn3270 protocol library for %{name}
 
 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
 
-%package devel
+%package -n lib3270-devel
 Summary:	Devel for 3270 Communication library for %{name}
-Group:		Development/Libraries
-Requires:	%{name}-lib = @PACKAGE_VERSION@
+Group:		Development/Libraries/C and C++
+Requires:	lib3270 = @PACKAGE_VERSION@
 
-%description devel
+%description -n lib3270-devel
 devel for tn3270 protocol library for %{name}
 
 Revision @PACKAGE_REVISION@ from @PACKAGE_SOURCE@
@@ -127,13 +137,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@.png
 %{_datadir}/@PACKAGE_NAME@/@PACKAGE_NAME@-logo.png
 
-%files lib
+%files -n lib3270
 %defattr(-,root,root)
 %{_libdir}/lib3270.so
 
-%files devel
+%files -n lib3270-devel
 %defattr(-,root,root)
-%{_includedir}
+%{_includedir}/lib3270.h
+%{_includedir}/lib3270
 %{_datadir}/@PACKAGE_NAME@/ui/99debug.xml
 
 #---[ Scripts ]-------------------------------------------------------------------------------------------------------
--
libgit2 0.21.2