diff --git a/src/libpts/plugins/imc_swid/.gitignore b/src/libpts/plugins/imc_swid/.gitignore
index f78140252..448ad2f2a 100644
--- a/src/libpts/plugins/imc_swid/.gitignore
+++ b/src/libpts/plugins/imc_swid/.gitignore
@@ -1 +1 @@
-*.swidtag
+regid.2004-03.org.strongswan*.swidtag
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag
new file mode 100644
index 000000000..82e16d2d0
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_apache-2-2-22-13.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>apache2</product_title>
+  <product_version>
+    <name>2.2-22-13</name>
+    <numeric>
+      <major>2</major>
+      <minor>2</minor>
+      <build>22</build>
+      <review>13</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>Apache Software Foundation</name>
+    <regid>regid.1995-04.org.apache</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>apache-2-2-22-13</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag
new file mode 100644
index 000000000..9e856eb24
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_bind-9-8-4-dfsg.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>bind9</product_title>
+  <product_version>
+    <name>9-8-4-dfsg</name>
+    <numeric>
+      <major>9</major>
+      <minor>8</minor>
+      <build>4</build>
+      <review>dfsg</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>Internet Systems Consortium</name>
+    <regid>regid.1994-04.org.isc</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>bind-9-8-4-dfsg</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag
new file mode 100644
index 000000000..765026326
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libsqlite-3-7-13-1.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>libsqlite3</product_title>
+  <product_version>
+    <name>3.7.13-1</name>
+    <numeric>
+      <major>3</major>
+      <minor>7</minor>
+      <build>13</build>
+      <review>1</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>SQLite Project</name>
+    <regid>regid.2002-08.org.sqlite</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>libsqlite-3-7-13-1</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag
new file mode 100644
index 000000000..5a31c572b
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-1-0-1e-2.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>libssl1.0.0</product_title>
+  <product_version>
+    <name>1.0.1e-2</name>
+    <numeric>
+      <major>1</major>
+      <minor>0</minor>
+      <build>1e</build>
+      <review>2</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>OpenSSL Project</name>
+    <regid>regid.1998-12.org.openssl</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>libssl-1-0-1e-2</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag
new file mode 100644
index 000000000..cc6888b8d
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_libssl-dev-1-0-1e-2.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>libssl-dev</product_title>
+  <product_version>
+    <name>1.0.1e-2</name>
+    <numeric>
+      <major>1</major>
+      <minor>0</minor>
+      <build>1e</build>
+      <review>2</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>OpenSSL Project</name>
+    <regid>regid.1998-12.org.openssl</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>libssl-dev-1-0-1e-2</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag
new file mode 100644
index 000000000..af0a60d9e
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_openssl-1-0-1e-2.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>openssl</product_title>
+  <product_version>
+    <name>1.0.1e-2</name>
+    <numeric>
+      <major>1</major>
+      <minor>0</minor>
+      <build>1e</build>
+      <review>2</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>OpenSSL Project</name>
+    <regid>regid.1998-12.org.openssl</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>openssl-1-0-1e-2</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>
diff --git a/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag
new file mode 100644
index 000000000..43d0fdce3
--- /dev/null
+++ b/src/libpts/plugins/imc_swid/regid.1999-03.org.debian/regid.1999-03.org.debian_sqlite-3-7-13-1.swidtag
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<software_identification_tag xmlns="http://standards.iso.org/iso/19770/-2/2009/schema.xsd">
+  <entitlement_required_indicator>true</entitlement_required_indicator>
+  <product_title>sqlite3</product_title>
+  <product_version>
+    <name>3.7.13-1</name>
+    <numeric>
+      <major>3</major>
+      <minor>7</minor>
+      <build>13</build>
+      <review>1</review>
+    </numeric>
+  </product_version>
+  <software_creator>
+    <name>SQLite Project</name>
+    <regid>regid.2002-08.org.sqlite</regid>
+  </software_creator>
+  <software_licensor>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </software_licensor>
+  <software_id>
+    <unique_id>sqlite-3-7-13-1</unique_id>
+    <tag_creator_regid>regid.1999-03.org.debian</tag_creator_regid>
+  </software_id>
+  <tag_creator>
+    <name>Debian Project</name>
+    <regid>regid.1999-03.org.debian</regid>
+  </tag_creator>
+</software_identification_tag>