diff -ruN pichi.orig/Makefile pichi/Makefile
--- pichi.orig/Makefile	1970-01-01 00:00:00.000000000 +0000
+++ pichi/Makefile	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/pichi/Makefile 540491 2020-06-26 11:15:18Z fernape $
 
 PORTNAME=	pichi
-DISTVERSION=	1.3.0
+DISTVERSION=	1.3.1
 CATEGORIES=	net
 
 MAINTAINER=	pichi@elude.in
diff -ruN pichi.orig/distinfo pichi/distinfo
--- pichi.orig/distinfo	1970-01-01 00:00:00.000000000 +0000
+++ pichi/distinfo	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +1,2 @@
-TIMESTAMP = 1554899633
-SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c
-SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723
+SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac
+SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432
diff -ruN pichi.orig/files/patch-include_pichi_config.hpp.in pichi/files/patch-include_pichi_config.hpp.in
--- pichi.orig/files/patch-include_pichi_config.hpp.in	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-include_pichi_config.hpp.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
---- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
-+++ include/pichi/config.hpp.in
-@@ -42,6 +42,15 @@
- #pragma warning(pop)
- #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
- 
-+#ifdef __clang__
-+#if !__has_feature(c_atomic)
-+#pragma clang diagnostic push
-+#pragma clang diagnostic ignored "-Wc11-extensions"
-+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
-+#pragma clang diagnostic pop
-+#endif // !__has_feature(c_atomic)
-+#endif // __clang__
-+
- #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
- 
- #ifdef CMAKE_INSTALL_PREFIX
diff -ruN pichi.orig/files/patch-server_main.cpp pichi/files/patch-server_main.cpp
--- pichi.orig/files/patch-server_main.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-server_main.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
---- server/main.cpp.orig	1970-01-01 00:00:00 UTC
-+++ server/main.cpp
-@@ -1,10 +1,11 @@
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/filesystem/operations.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/program_options.hpp>
- #include <fstream>
- #include <iostream>
- #include <memory>
--#include <pichi/config.hpp>
- #include <stdio.h>
- #ifdef HAS_UNISTD_H
- #include <errno.h>
diff -ruN pichi.orig/files/patch-test_endpoint.cpp pichi/files/patch-test_endpoint.cpp
--- pichi.orig/files/patch-test_endpoint.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_endpoint.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,12 +0,0 @@
---- test/endpoint.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/endpoint.cpp
-@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
- #ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
-       <uint8_t, 13>
- #endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
--      {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
-+      {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
-+       0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
- 
-   auto fact = array<uint8_t, 13>{};
-   auto len = serializeEndpoint(makeEndpoint(host, port), fact);
diff -ruN pichi.orig/files/patch-test_method.cpp pichi/files/patch-test_method.cpp
--- pichi.orig/files/patch-test_method.cpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_method.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
---- test/method.cpp.orig	1970-01-01 00:00:00 UTC
-+++ test/method.cpp
-@@ -1,5 +1,6 @@
- #define BOOST_TEST_MODULE pichi method test
- 
-+#include "utils.hpp"
- #include <boost/test/unit_test.hpp>
- #include <pichi/common.hpp>
- #include <pichi/crypto/method.hpp>
diff -ruN pichi.orig/files/patch-test_utils.hpp pichi/files/patch-test_utils.hpp
--- pichi.orig/files/patch-test_utils.hpp	1970-01-01 00:00:00.000000000 +0000
+++ pichi/files/patch-test_utils.hpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
---- test/utils.hpp.orig	1970-01-01 00:00:00 UTC
-+++ test/utils.hpp
-@@ -1,6 +1,8 @@
- #ifndef PICHI_TEST_UTILS_HPP
- #define PICHI_TEST_UTILS_HPP
- 
-+#include <pichi/config.hpp>
-+// Include config.hpp first
- #include <boost/asio/error.hpp>
- #include <boost/beast/http/error.hpp>
- #include <pichi/api/vos.hpp>
diff -ruN pichi.orig/pkg-plist pichi/pkg-plist
--- pichi.orig/pkg-plist	1970-01-01 00:00:00.000000000 +0000
+++ pichi/pkg-plist	1970-01-01 00:00:00.000000000 +0000
@@ -37,7 +37,7 @@
 %%DEVEL%%include/pichi/net/spawn.hpp
 %%DEVEL%%include/pichi/net/ssaead.hpp
 %%DEVEL%%include/pichi/net/ssstream.hpp
+%%DEVEL%%include/pichi/net/stream.hpp
 %%DEVEL%%include/pichi/net/tunnel.hpp
-%%DEVEL%%include/pichi/test/socket.hpp
 %%DEVEL%%include/pichi/uri.hpp
 %%DEVEL%%include/pichi.h