diff --git a/hardware/disk/lvm2/pspec.xml b/hardware/disk/lvm2/pspec.xml
index d2f17dbd..bad78970 100644
--- a/hardware/disk/lvm2/pspec.xml
+++ b/hardware/disk/lvm2/pspec.xml
@@ -47,7 +47,6 @@
 
     <Package>
         <Name>device-mapper-devel</Name>
-        <PartOf>system.devel</PartOf>
         <Summary>Development libraries and headers for device-mapper</Summary>
         <Description>Device-mapper-devel contains files needed to develop applications that use the device-mapper libraries.</Description>
         <RuntimeDependencies>
@@ -79,7 +78,6 @@
 
     <Package>
         <Name>device-mapper-event-devel</Name>
-        <PartOf>system.devel</PartOf>
         <Summary>Development libraries and headers for the device-mapper event daemon</Summary>
         <Description>This contains contains files needed to develop applications that use the device-mapper event library.</Description>
         <RuntimeDependencies>
@@ -143,7 +141,6 @@
 
     <Package>
         <Name>lvm2-devel</Name>
-        <PartOf>system.devel</PartOf>
         <Summary>Development libraries and headers</Summary>
         <Description>This package contains files needed to develop applications that use the lvm2 libraries.</Description>
         <RuntimeDependencies>
@@ -161,7 +158,6 @@
 
     <Package>
         <Name>dietlibc-libdevmapper</Name>
-        <PartOf>system.devel</PartOf>
         <Summary>Static devmapper library built with dietlibc</Summary>
         <Description>device mapper contains ioctl library and utilities for use with logical volume management (LVM2) built with dietlibc</Description>
         <Files>
diff --git a/system/base/cryptsetup/pspec.xml b/system/base/cryptsetup/pspec.xml
index 6747408b..12786a5e 100644
--- a/system/base/cryptsetup/pspec.xml
+++ b/system/base/cryptsetup/pspec.xml
@@ -5,7 +5,7 @@
         <Name>cryptsetup</Name>
         <Homepage>https://gitlab.com/cryptsetup/cryptsetup</Homepage>
         <Packager>
-            <Name>Erdem Artan</Name>
+            <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
         </Packager>
         <License>GPLv2</License>
@@ -15,7 +15,7 @@
         <Description>Userspace setup tool for transparent encryption of block devices using dm-crypt</Description>
         <Archive sha1sum="7cb02f1e23ee18cd26391fd856f7644195b4544e" type="tarxz">https://www.kernel.org/pub/linux/utils/cryptsetup/v1.6/cryptsetup-1.6.7.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency releaseFrom="7">device-mapper-devel</Dependency>
+            <Dependency versionFrom="2.02.118">device-mapper-devel</Dependency>
             <Dependency>libgpg-error-devel</Dependency>
             <Dependency>libgcrypt-devel</Dependency>
             <Dependency>python-devel</Dependency>
@@ -27,6 +27,7 @@
 
     <Package>
         <Name>cryptsetup</Name>
+        <PartOf>util.crypt</PartOf>
         <RuntimeDependencies>
             <Dependency version="current">libcryptsetup</Dependency>
             <Dependency>popt</Dependency>
@@ -41,6 +42,7 @@
     
     <Package>
         <Name>libcryptsetup</Name>
+        <PartOf>util.crypt</PartOf>
         <Summary>cryptsetup libraries</Summary>
         <RuntimeDependencies>
             <Dependency>device-mapper</Dependency>
@@ -55,6 +57,7 @@
     
     <Package>
         <Name>libcryptsetup-devel</Name>
+        <PartOf>programming.devel</PartOf>
         <Summary>libcryptsetup devel files</Summary>
         <RuntimeDependencies>
             <Dependency version="current">libcryptsetup</Dependency>