5 files changed, 18 insertions, 5 deletions
diff --git a/packaging/ejdb.spec b/packaging/ejdb.spec
index 38cf159..346d316 100644
--- a/packaging/ejdb.spec
+++ b/packaging/ejdb.spec
@@ -23,6 +23,13 @@ Group: Development
 %description devel
 This package provides header files and other developer releated files for package %{name}.
 
+%package bin
+Summary: Tools for dealing with ejdb files
+Group:   System/Database
+
+%description bin
+This package provides several command line tools for dealing with EJDB and Tokyo Cabinet files.
+
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -47,11 +54,13 @@ EOF
 %files
 %license LICENSE
 %manifest %{name}.manifest
+%{_libdir}/libejdb.so.1*
+
+%files bin
 %{_bindir}/jbbmgr
 %{_bindir}/jbfmgr
 %{_bindir}/jbhmgr
 %{_bindir}/jbtmgr
-%{_libdir}/libejdb.so.1*
 
 %docs_package
 
diff --git a/src/tcbdb/tools/CMakeLists.txt b/src/tcbdb/tools/CMakeLists.txt
index fc1b2bd..b24f0f5 100644
--- a/src/tcbdb/tools/CMakeLists.txt
+++ b/src/tcbdb/tools/CMakeLists.txt
@@ -2,7 +2,8 @@ link_libraries(ejdb_p)
 add_executable(jbbmgr jbbmgr.c)
 
 set_target_properties(jbbmgr PROPERTIES
-					  COMPILE_FLAGS "-DEJDB_STATIC")
+					  LINK_FLAGS "-Wl,--as-needed -pie"
+					  COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
 
 
 install(TARGETS jbbmgr
diff --git a/src/tcfdb/tools/CMakeLists.txt b/src/tcfdb/tools/CMakeLists.txt
index 2493f99..02a0a94 100644
--- a/src/tcfdb/tools/CMakeLists.txt
+++ b/src/tcfdb/tools/CMakeLists.txt
@@ -2,7 +2,8 @@ link_libraries(ejdb_p)
 add_executable(jbfmgr jbfmgr.c)
 
 set_target_properties(jbfmgr PROPERTIES
-					  COMPILE_FLAGS "-DEJDB_STATIC")
+					  LINK_FLAGS  "-Wl,--as-needed -pie"
+					  COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
 					  
 install(TARGETS jbfmgr
 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
diff --git a/src/tchdb/tools/CMakeLists.txt b/src/tchdb/tools/CMakeLists.txt
index f12e3ed..c59f7b0 100644
--- a/src/tchdb/tools/CMakeLists.txt
+++ b/src/tchdb/tools/CMakeLists.txt
@@ -1,7 +1,8 @@
 link_libraries(ejdb_p)
 add_executable(jbhmgr jbhmgr.c)
 set_target_properties(jbhmgr PROPERTIES
-					  COMPILE_FLAGS "-DEJDB_STATIC")
+					  LINK_FLAGS "-Wl,--as-needed -pie"
+					  COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
 
 install(TARGETS jbhmgr
 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
diff --git a/src/tctdb/tools/CMakeLists.txt b/src/tctdb/tools/CMakeLists.txt
index e819900..39998d1 100644
--- a/src/tctdb/tools/CMakeLists.txt
+++ b/src/tctdb/tools/CMakeLists.txt
@@ -1,7 +1,8 @@
 link_libraries(ejdb_p)
 add_executable(jbtmgr jbtmgr.c)
 set_target_properties(jbtmgr PROPERTIES
-					  COMPILE_FLAGS "-DEJDB_STATIC")
+					  LINK_FLAGS "-Wl,--as-needed -pie"
+					  COMPILE_FLAGS "-DEJDB_STATIC -fPIE")
 
 install(TARGETS jbtmgr
 	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}