diff --git a/README.org b/README.org
index 9cf1937..98eae02 100644
--- a/README.org
+++ b/README.org
@@ -21,9 +21,10 @@
   qrencode RET=.
 
   QR Codes are rendered as Unicode text, but there is an option to
-  export them as bitmap (NetPBM format) by pressing =e= in the QR Code
-  buffer.  There are also some public elisp library functions to
-  generate QR Codes for use in other elisp code.
+  export them as bitmap (NetPBM format) or vector graphics (SVG) by
+  pressing =e= in the QR Code buffer.  There are also some public
+  elisp library functions to generate QR Codes for use in other elisp
+  code.
 
   Currently two NetPBM formats are supported: P1 and P4.  The latter
   is much smaller and the exporter much faster, so highly recommended.
@@ -32,6 +33,10 @@
   format can be changed.  In the next major version release P1 support
   is likely to get dropped in favour of P4.
 
+  SVG export is available if =svg.el= (Emacs 26.1 or newer) is
+  available.  This can be selected by customizing
+  =qrencode-export-format= to ='svg=.
+
 *** Converting different bitmaps
 
   This package only supports exporting to NetPBM format due to the
@@ -60,7 +65,7 @@
 
    [[file:https://github.com/ruediger/qrencode-el/actions/workflows/test.yml/badge.svg]]
 
-  The code is written in pure Emacs Lisp on GNU Emacs 27.  It should
+  The code is written in pure Emacs Lisp on GNU Emacs 31.  It should
   be backwards compatible to GNU Emacs 25.1 and potentially even
   earlier with =seq= and =cl-lib= compat libraries.
 
diff --git a/qr-self.svg b/qr-self.svg
new file mode 100644
index 0000000..0d52712
--- /dev/null
+++ b/qr-self.svg
@@ -0,0 +1 @@
+<svg width="111" height="111" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 37 37"><rect width="37" height="37" x="0" y="0" fill="#fff"></rect><path fill="#000" d="M4 4h7v1h-7zM12 4h1v1h-1zM14 4h4v1h-4zM22 4h3v1h-3zM26 4h7v1h-7zM4 5h1v1h-1zM10 5h1v1h-1zM12 5h2v1h-2zM15 5h2v1h-2zM20 5h3v1h-3zM26 5h1v1h-1zM32 5h1v1h-1zM4 6h1v1h-1zM6 6h3v1h-3zM10 6h1v1h-1zM13 6h2v1h-2zM16 6h3v1h-3zM23 6h2v1h-2zM26 6h1v1h-1zM28 6h3v1h-3zM32 6h1v1h-1zM4 7h1v1h-1zM6 7h3v1h-3zM10 7h1v1h-1zM12 7h2v1h-2zM17 7h3v1h-3zM21 7h1v1h-1zM26 7h1v1h-1zM28 7h3v1h-3zM32 7h1v1h-1zM4 8h1v1h-1zM6 8h3v1h-3zM10 8h1v1h-1zM16 8h1v1h-1zM18 8h3v1h-3zM23 8h1v1h-1zM26 8h1v1h-1zM28 8h3v1h-3zM32 8h1v1h-1zM4 9h1v1h-1zM10 9h1v1h-1zM15 9h4v1h-4zM20 9h1v1h-1zM23 9h2v1h-2zM26 9h1v1h-1zM32 9h1v1h-1zM4 10h7v1h-7zM12 10h1v1h-1zM14 10h1v1h-1zM16 10h1v1h-1zM18 10h1v1h-1zM20 10h1v1h-1zM22 10h1v1h-1zM24 10h1v1h-1zM26 10h7v1h-7zM12 11h4v1h-4zM20 11h3v1h-3zM4 12h1v1h-1zM6 12h2v1h-2zM9 12h3v1h-3zM13 12h2v1h-2zM16 12h1v1h-1zM18 12h1v1h-1zM20 12h5v1h-5zM26 12h1v1h-1zM29 12h1v1h-1zM31 12h2v1h-2zM4 13h2v1h-2zM12 13h3v1h-3zM17 13h1v1h-1zM20 13h1v1h-1zM22 13h3v1h-3zM26 13h3v1h-3zM32 13h1v1h-1zM4 14h4v1h-4zM9 14h2v1h-2zM13 14h1v1h-1zM15 14h2v1h-2zM20 14h1v1h-1zM22 14h1v1h-1zM24 14h2v1h-2zM27 14h1v1h-1zM30 14h2v1h-2zM6 15h1v1h-1zM8 15h1v1h-1zM11 15h2v1h-2zM17 15h1v1h-1zM19 15h1v1h-1zM22 15h1v1h-1zM25 15h2v1h-2zM28 15h1v1h-1zM32 15h1v1h-1zM5 16h6v1h-6zM15 16h2v1h-2zM21 16h1v1h-1zM24 16h1v1h-1zM29 16h2v1h-2zM4 17h1v1h-1zM7 17h1v1h-1zM13 17h1v1h-1zM17 17h5v1h-5zM23 17h1v1h-1zM26 17h1v1h-1zM30 17h3v1h-3zM4 18h1v1h-1zM6 18h3v1h-3zM10 18h1v1h-1zM12 18h5v1h-5zM18 18h1v1h-1zM22 18h3v1h-3zM26 18h1v1h-1zM30 18h3v1h-3zM4 19h1v1h-1zM8 19h1v1h-1zM11 19h3v1h-3zM16 19h2v1h-2zM23 19h6v1h-6zM31 19h1v1h-1zM5 20h1v1h-1zM10 20h1v1h-1zM15 20h1v1h-1zM22 20h3v1h-3zM28 20h2v1h-2zM31 20h1v1h-1zM5 21h1v1h-1zM8 21h2v1h-2zM11 21h4v1h-4zM16 21h2v1h-2zM19 21h1v1h-1zM22 21h1v1h-1zM27 21h1v1h-1zM29 21h3v1h-3zM4 22h1v1h-1zM6 22h2v1h-2zM9 22h2v1h-2zM12 22h1v1h-1zM16 22h1v1h-1zM19 22h1v1h-1zM21 22h2v1h-2zM24 22h1v1h-1zM26 22h3v1h-3zM30 22h1v1h-1zM8 23h2v1h-2zM11 23h2v1h-2zM14 23h1v1h-1zM19 23h3v1h-3zM26 23h3v1h-3zM30 23h1v1h-1zM5 24h2v1h-2zM8 24h3v1h-3zM16 24h2v1h-2zM19 24h3v1h-3zM24 24h7v1h-7zM12 25h7v1h-7zM20 25h3v1h-3zM24 25h1v1h-1zM28 25h5v1h-5zM4 26h7v1h-7zM12 26h2v1h-2zM15 26h1v1h-1zM17 26h1v1h-1zM20 26h1v1h-1zM22 26h3v1h-3zM26 26h1v1h-1zM28 26h2v1h-2zM31 26h1v1h-1zM4 27h1v1h-1zM10 27h1v1h-1zM12 27h1v1h-1zM14 27h2v1h-2zM22 27h1v1h-1zM24 27h1v1h-1zM28 27h2v1h-2zM31 27h1v1h-1zM4 28h1v1h-1zM6 28h3v1h-3zM10 28h1v1h-1zM13 28h1v1h-1zM15 28h1v1h-1zM18 28h2v1h-2zM21 28h1v1h-1zM24 28h5v1h-5zM30 28h1v1h-1zM4 29h1v1h-1zM6 29h3v1h-3zM10 29h1v1h-1zM12 29h1v1h-1zM15 29h9v1h-9zM25 29h1v1h-1zM27 29h3v1h-3zM32 29h1v1h-1zM4 30h1v1h-1zM6 30h3v1h-3zM10 30h1v1h-1zM12 30h1v1h-1zM14 30h1v1h-1zM20 30h1v1h-1zM24 30h1v1h-1zM27 30h1v1h-1zM30 30h1v1h-1zM32 30h1v1h-1zM4 31h1v1h-1zM10 31h1v1h-1zM13 31h1v1h-1zM15 31h1v1h-1zM17 31h1v1h-1zM24 31h2v1h-2zM27 31h1v1h-1zM29 31h1v1h-1zM31 31h1v1h-1zM4 32h7v1h-7zM12 32h1v1h-1zM14 32h1v1h-1zM17 32h2v1h-2zM20 32h1v1h-1zM22 32h5v1h-5zM31 32h1v1h-1z"></path></svg>
diff --git a/qrencode-tests.el b/qrencode-tests.el
index 973a973..a26aa5c 100644
--- a/qrencode-tests.el
+++ b/qrencode-tests.el
@@ -536,6 +536,13 @@ The expected word for version 7 is the literal from section 7.10 of the
 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
 ")))
 
+(ert-deftest qrencode-svg-path-test ()
+  "Test SVG path."
+  (skip-unless (featurep 'svg))
+  (should (string= (qrencode--svg-path [[0 0] [0 0]] 0) ""))
+  (should (string= (qrencode--svg-path [[1 1] [1 1]] 0) "M0 0h2v1h-2zM0 1h2v1h-2z"))
+  (should (string= (qrencode--svg-path [[0 0 1] [0 1 1] [0 0 0]] 0) "M2 0h1v1h-1zM1 1h2v1h-2z")))
+
 (defun qrencode-tests--get-file (filename)
   "Helper function returning contents of FILENAME."
   (with-temp-buffer
@@ -553,7 +560,8 @@ The expected word for version 7 is the literal from section 7.10 of the
     (should (not (null qrencode--raw-qr)))
     (let ((tmpfile-p1 (make-temp-file "qr-p1" nil ".pbm"))
           (tmpfile-p4 (make-temp-file "qr-p4" nil ".pbm"))
-          p1 p4)
+          (tmpfile-svg (make-temp-file "qr-svg" nil ".svg"))
+          p1 p4 svg)
       (unwind-protect
           (progn
             (let ((qrencode-export-format 'p1))
@@ -564,18 +572,26 @@ The expected word for version 7 is the literal from section 7.10 of the
               (qrencode-export-buffer-to-file tmpfile-p4))
             (setq p4 (qrencode-tests--get-file tmpfile-p4))
             (should (string-prefix-p "P4\n" p4))
+            (when (featurep 'svg)
+              (let ((qrencode-export-format 'svg))
+                (qrencode-export-buffer-to-file tmpfile-svg))
+              (setq svg (qrencode-tests--get-file tmpfile-svg))
+              (should (string-prefix-p "<svg " svg)))
             ;; TODO: test sizes.
             ;; TODO: test pixel equivalence between P1 and P4.
             )
         (delete-file tmpfile-p1)
-        (delete-file tmpfile-p4)))))
+        (delete-file tmpfile-p4)
+        (delete-file tmpfile-svg)))))
 
 (ert-deftest qrencode-zbarimg-test ()
   "Test decoding generated QRCodes using the zbarimg program."
   (let ((zbarimg (executable-find "zbarimg")))
     (skip-unless zbarimg)
     (let ((tmpfile-p1 (make-temp-file "qr-p1" nil ".pbm"))
-          (tmpfile-p4 (make-temp-file "qr-p4" nil ".pbm")))
+          (tmpfile-p4 (make-temp-file "qr-p4" nil ".pbm"))
+          (tmpfile-svg (make-temp-file "qr-svg" nil ".svg"))
+          qr)
       (unwind-protect
           (cl-loop for input across
                    ["hello"
@@ -588,14 +604,19 @@ The expected word for version 7 is the literal from section 7.10 of the
                     ;; raw UTF-8 characters
                     "😸🚗愛"
                     ]
-                   do (qrencode--write-as-netpbm-p4 tmpfile-p4 (qrencode input nil nil 'return-raw))
+                   do (setq qr (qrencode input nil nil 'return-raw))
+                   do (qrencode--write-as-netpbm-p4 tmpfile-p4 qr)
                    do (with-temp-file tmpfile-p1
-                        (insert (qrencode-format-as-netpbm (qrencode input nil nil 'return-raw))))
-                   do (dolist (tmpfile (list tmpfile-p1 tmpfile-p4))
-                        (should (string= (shell-command-to-string (format "%s -q '%s'" zbarimg tmpfile))
-                                         (format "QR-Code:%s\n" input)))))
+                        (insert (qrencode-format-as-netpbm qr)))
+                   do (when (featurep 'svg)
+                        (qrencode--write-as-svg tmpfile-svg qr))
+                   do (dolist (tmpfile (list tmpfile-p1 tmpfile-p4 (when (featurep 'svg) tmpfile-svg)))
+                        (when tmpfile
+                         (should (string= (shell-command-to-string (format "%s -q '%s'" zbarimg tmpfile))
+                                          (format "QR-Code:%s\n" input))))))
         (delete-file tmpfile-p1)
-        (delete-file tmpfile-p4)))))
+        (delete-file tmpfile-p4)
+        (delete-file tmpfile-svg)))))
 
 (provide 'qrencode-tests)
 ;;; qrencode-tests.el ends here
diff --git a/qrencode.el b/qrencode.el
index e46a01b..dbde961 100644
--- a/qrencode.el
+++ b/qrencode.el
@@ -4,7 +4,7 @@
 
 ;; Author: Rüdiger Sonderfeld <ruediger@c-plusplus.net>
 ;; Keywords: qrcode comm
-;; Version: 1.5
+;; Version: 1.6-beta1
 ;; Package-Requires: ((emacs "25.1"))
 ;; Package: qrencode
 ;; URL: https://github.com/ruediger/qrencode-el
@@ -44,6 +44,9 @@
 (require 'seq)
 (require 'thingatpt)
 
+;; svg.el is only available in Emacs 26.1 and newer.
+(require 'svg nil 'noerror)
+
 ;;; Error correction
 ;; Reed solomon ECC implementation based on https://research.swtch.com/field
 
@@ -1043,6 +1046,61 @@ Optionally specify PIXEL-SIZE (default is 3)."
      (dotimes (_ quiet-zone-size)
        (dotimes (_ bsize) (insert 0))))))
 
+;; Declare SVG functions in case svg.el is not available.
+(declare-function svg-create "svg" (width height &rest args))
+(declare-function svg-rectangle "svg" (svg x y width height &rest args))
+(declare-function svg-node "svg" (svg tag &rest args))
+(declare-function svg-print "svg" (dom))
+
+(defun qrencode--svg-path (qr quiet-zone-size)
+  "Return svg path for QR with QUIET-ZONE-SIZE."
+  (with-temp-buffer
+    (let ((size (length qr)))
+      (dotimes (r size)
+        (let ((c 0))
+          (while (< c size)
+            (if (= (qrencode--aaref qr c r) 1)
+                (let ((start c))
+                  ;; We only bother scanning one row at a time and turning
+                  ;; series of 1's into a rectangle.
+                  (while (and (< c size) (= (qrencode--aaref qr c r) 1))
+                    (setq c (1+ c)))
+                  (let ((block-len (- c start)))
+                    (insert
+                     ;; `Mx y` move to x,y absolute
+                     ;; `hx` draw x horizontal relative
+                     ;; `v1` draw 1 vertical relative
+                     ;; `z` close
+                     (format "M%d %dh%dv1h-%dz"
+                             (+ start quiet-zone-size)
+                             (+ r quiet-zone-size)
+                             block-len
+                             block-len))))
+              (setq c (1+ c)))))))
+    (buffer-string)))
+
+(defun qrencode-as-svg (qr &optional pixel-size inverse)
+  "Return an svg object of QR code.
+See documentation of svg.el for how to use the object.
+Optional argument PIXEL-SIZE (default is 3) and INVERSE to flip white/dark mode."
+  (let* ((size (length qr))
+         (quiet-zone-size 4)
+         (pixel-size (or pixel-size 3))
+         (size-wqz (+ quiet-zone-size size quiet-zone-size))
+         (width-height (* size-wqz pixel-size))
+         (background-colour (if inverse "#000" "#fff"))
+         (fill-colour (if inverse "#fff" "#000"))
+         (svgimg (svg-create width-height width-height :viewBox (format "0 0 %d %d" size-wqz size-wqz))))
+    (svg-rectangle svgimg 0 0 size-wqz size-wqz :fill background-colour)  ;; background
+    (svg-node svgimg 'path :d (qrencode--svg-path qr quiet-zone-size) :fill fill-colour)
+    svgimg))
+
+(defun qrencode--write-as-svg (filename qr &optional pixel-size)
+  "Write QR as svg to FILENAME."
+  (with-temp-file filename
+    (svg-print (qrencode-as-svg qr pixel-size))
+    (insert "\n")))
+
 (defgroup qrencode nil
   "QREncode: Encoder for QR Codes."
   :link '(url-link "https://github.com/ruediger/qrencode-el")
@@ -1073,9 +1131,10 @@ bitmap format."
 P1 is the current default.  But P4 export is much faster and produces
 smaller (binary) files.  In the next major release the default will
 change to P4 and P1 support will be removed."
-  :type '(choice
+  :type `(choice
           (const :tag "NetPBM text (P1)" p1)
-          (const :tag "NetPBM binary (P4)" p4))
+          (const :tag "NetPBM binary (P4)" p4)
+          ,@(when (featurep 'svg) '((const :tag "SVG" svg))))
   :package-version '(qrencode . "1.5-beta4")
   :group 'qrencode)
 
@@ -1094,6 +1153,8 @@ change to P4 and P1 support will be removed."
       (error "No raw QRCode data found")
     (let ((qr qrencode--raw-qr))       ; save ref to buffer local var.
       (pcase qrencode-export-format
+        ((and 'svg (guard (featurep 'svg)))
+         (qrencode--write-as-svg filename qr qrencode-export-pixel-size))
         ('p4
          (qrencode--write-as-netpbm-p4 filename qr qrencode-export-pixel-size))
         ((or 'p1 'nil)