2 files changed, 4 insertions, 3 deletions
diff --git a/mitmproxy/models/flow.py b/mitmproxy/models/flow.py
index de86e451..0e4f80cb 100644
--- a/mitmproxy/models/flow.py
+++ b/mitmproxy/models/flow.py
@@ -5,10 +5,11 @@ import copy
 import uuid
 
 from mitmproxy import stateobject
-from mitmproxy import version
 from mitmproxy.models.connections import ClientConnection
 from mitmproxy.models.connections import ServerConnection
 
+from netlib import version
+
 
 class Error(stateobject.StateObject):
 
diff --git a/mitmproxy/models/http.py b/mitmproxy/models/http.py
index a32124ac..01f5f1ee 100644
--- a/mitmproxy/models/http.py
+++ b/mitmproxy/models/http.py
@@ -2,9 +2,9 @@ from __future__ import absolute_import, print_function, division
 
 import cgi
 
-from mitmproxy import version
 from mitmproxy.models.flow import Flow
 from netlib import encoding
+from netlib import version
 from netlib.http import Headers
 from netlib.http import Request
 from netlib.http import Response
@@ -258,7 +258,7 @@ def make_error_response(status_code, message, headers=None):
 
     if not headers:
         headers = Headers(
-            Server=version.NAMEVERSION,
+            Server=version.MITMPROXY,
             Connection="close",
             Content_Length=str(len(body)),
             Content_Type="text/html"