diff --git a/etc/exabgp/conf-cap-software-version.conf b/etc/exabgp/conf-cap-software-version.conf
new file mode 100644
index 000000000..f51d37d80
--- /dev/null
+++ b/etc/exabgp/conf-cap-software-version.conf
@@ -0,0 +1,15 @@
+neighbor 127.0.0.1 {
+	router-id 10.0.0.2;
+	local-address 127.0.0.1;
+	local-as 65533;
+	peer-as 65533;
+	hold-time 180;
+
+	capability {
+		software-version enable;
+	}
+
+	family {
+		ipv4 unicast;
+	}
+}
diff --git a/qa/encoding/conf-cap-software-version.ci b/qa/encoding/conf-cap-software-version.ci
new file mode 100644
index 000000000..2fec6bcaa
--- /dev/null
+++ b/qa/encoding/conf-cap-software-version.ci
@@ -0,0 +1 @@
+conf-cap-software-version.conf
diff --git a/qa/encoding/conf-cap-software-version.msg b/qa/encoding/conf-cap-software-version.msg
new file mode 100644
index 000000000..4b18bd491
--- /dev/null
+++ b/qa/encoding/conf-cap-software-version.msg
@@ -0,0 +1,2 @@
+option:open:inspect-open-message
+1:raw:FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF:0051:01:04FFFD00B40A000002340206010400010001020641040000FFFD02224B201F4578614247502F6D61696E2D346634323232663265642D3230323430373135