diff --git a/ChangeLog b/ChangeLog
index 523ccf5..cce1fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2021-04-16  cage
+
+	* src/gemini/gemini-parser.lisp,
+	* src/iri-parser.lisp,
+	* src/package.lisp,
+	* src/tests/iri-tests.lisp,
+        * src/gemini/client.lisp,
+
+	- [gemini] allowed to connect to host using IP address instead of
+        hostname;
+	- fixed 'make-gemini-iri', was building wrong IRI with IP6 address
+        as host;
+	- trimmed square brackets from IP literal when parsing an IRI;
+	- [gemini] prevented trimming of preformatted gemtext line.
+
 2021-04-13 cage
 
 	* src/gemini/gemini-parser.lisp,
diff --git a/NEWS.org b/NEWS.org
index 2d3b6d6..8717808 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,3 +1,12 @@
+* 2021-04-16 version 0.6.1
+
+  - Bugfix
+    - [gemini]
+      - Connecting to gemini URI using  IP address instead of hostname
+        should be possible now;
+      - Fixed  formatting of  preformatted  lines (a  bug was  cutting
+        spaces from both ends of the line)
+
 * 2021-04-15 version 0.6.0
 
   - New Features
diff --git a/configure b/configure
index 806aad7..bacb472 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tinmop 0.6.0.
+# Generated by GNU Autoconf 2.69 for tinmop 0.6.1.
 #
 # Report bugs to <https://notabug.org/cage/tinmop/>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tinmop'
 PACKAGE_TARNAME='tinmop'
-PACKAGE_VERSION='0.6.0'
-PACKAGE_STRING='tinmop 0.6.0'
+PACKAGE_VERSION='0.6.1'
+PACKAGE_STRING='tinmop 0.6.1'
 PACKAGE_BUGREPORT='https://notabug.org/cage/tinmop/'
 PACKAGE_URL=''
 
@@ -1279,7 +1279,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tinmop 0.6.0 to adapt to many kinds of systems.
+\`configure' configures tinmop 0.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1350,7 +1350,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tinmop 0.6.0:";;
+     short | recursive ) echo "Configuration of tinmop 0.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1454,7 +1454,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tinmop configure 0.6.0
+tinmop configure 0.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1634,7 +1634,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tinmop $as_me 0.6.0, which was
+It was created by tinmop $as_me 0.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2494,7 +2494,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='tinmop'
- VERSION='0.6.0'
+ VERSION='0.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7068,7 +7068,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tinmop $as_me 0.6.0, which was
+This file was extended by tinmop $as_me 0.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7125,7 +7125,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tinmop config.status 0.6.0
+tinmop config.status 0.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index a7b3cda..8232450 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with this program.
 dnl If not, see [[http://www.gnu.org/licenses/][http://www.gnu.org/licenses/]].
 
-AC_INIT([tinmop],[0.6.0],[https://notabug.org/cage/tinmop/],[tinmop])
+AC_INIT([tinmop],[0.6.1],[https://notabug.org/cage/tinmop/],[tinmop])
 
 AM_INIT_AUTOMAKE([-Wall foreign])
 
diff --git a/tinmop.asd b/tinmop.asd
index 138ce4e..bf561d3 100644
--- a/tinmop.asd
+++ b/tinmop.asd
@@ -18,7 +18,7 @@
 (defsystem :tinmop
   :author      "cage"
   :license     "GPLv3"
-  :version     "0.6.0"
+  :version     "0.6.1"
   :pathname    "src"
   :serial      t
   :depends-on (:alexandria