diff --git a/.gitignore b/.gitignore
index 69fcc36ed0..5fd79946de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ qrc_*.cpp
 #mac specific
 .DS_Store
 build
+doc/Doxyfile
 
 !src/leveldb/Makefile
 
diff --git a/share/qt/extract_strings_qt.py b/share/qt/extract_strings_qt.py
index 771f28ab0a..5492fdb8c5 100644
--- a/share/qt/extract_strings_qt.py
+++ b/share/qt/extract_strings_qt.py
@@ -1,12 +1,18 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# Copyright (c) 2012-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 '''
-Extract _("...") strings for translation and convert to Qt4 stringdefs so that
+Extract _("...") strings for translation and convert to Qt stringdefs so that
 they can be picked up by Qt linguist.
 '''
+from __future__ import division,print_function,unicode_literals
 from subprocess import Popen, PIPE
-import glob
+import operator
+import os
+import sys
 
-OUT_CPP="src/qt/bitcoinstrings.cpp"
+OUT_CPP="qt/bitcoinstrings.cpp"
 EMPTY=['""']
 
 def parse_po(text):
@@ -28,7 +34,7 @@ def parse_po(text):
                 in_msgstr = False
             # message start
             in_msgid = True
-            
+
             msgid = [line[6:]]
         elif line.startswith('msgstr '):
             in_msgid = False
@@ -45,26 +51,39 @@ def parse_po(text):
 
     return messages
 
-files = glob.glob('src/*.cpp') + glob.glob('src/*.h') 
+files = sys.argv[1:]
 
 # xgettext -n --keyword=_ $FILES
-child = Popen(['xgettext','--output=-','-n','--keyword=_'] + files, stdout=PIPE)
+XGETTEXT=os.getenv('XGETTEXT', 'xgettext')
+if not XGETTEXT:
+    print('Cannot extract strings: xgettext utility is not installed or not configured.',file=sys.stderr)
+    print('Please install package "gettext" and re-run \'./configure\'.',file=sys.stderr)
+    exit(1)
+child = Popen([XGETTEXT,'--output=-','-n','--keyword=_'] + files, stdout=PIPE)
 (out, err) = child.communicate()
 
-messages = parse_po(out) 
+messages = parse_po(out.decode('utf-8'))
 
 f = open(OUT_CPP, 'w')
-f.write("""#include <QtGlobal>
-// Automatically generated by extract_strings.py
+f.write("""
+
+#include <QtGlobal>
+
+// Automatically generated by extract_strings_qt.py
 #ifdef __GNUC__
 #define UNUSED __attribute__((unused))
 #else
 #define UNUSED
 #endif
 """)
-f.write('static const char UNUSED *bitcoin_strings[] = {')
+f.write('static const char UNUSED *bitcoin_strings[] = {\n')
+f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('PACKAGE_NAME'),))
+f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS'),))
+if os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION') != os.getenv('PACKAGE_NAME'):
+    f.write('QT_TRANSLATE_NOOP("bitcoin-core", "%s"),\n' % (os.getenv('COPYRIGHT_HOLDERS_SUBSTITUTION'),))
+messages.sort(key=operator.itemgetter(0))
 for (msgid, msgstr) in messages:
     if msgid != EMPTY:
         f.write('QT_TRANSLATE_NOOP("bitcoin-core", %s),\n' % ('\n'.join(msgid)))
-f.write('};')
+f.write('};\n')
 f.close()
diff --git a/src/Makefile.am b/src/Makefile.am
index 73e01e4548..1c4ed26633 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,9 +28,9 @@ BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS)
 #LIBBITCOIN_COMMON=libbitcoin_common.a
 #LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a
 #LIBBITCOIN_CLI=libbitcoin_cli.a
-#LIBBITCOIN_UTIL=libbitcoin_util.a
+LIBBITCOIN_UTIL=libbitcoin_util.a
 #LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
-#LIBBITCOINQT=qt/libbitcoinqt.a
+LIBBITCOINQT=qt/libbitcoinqt.a
 #LIBSECP256K1=secp256k1/libsecp256k1.la
 
 #if ENABLE_ZMQ
@@ -48,16 +48,17 @@ $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
 
 # Make is not made aware of per-object dependencies to avoid limiting building parallelization
 # But to build the less dependent modules first, we manually select their order here:
-#EXTRA_LIBRARIES += \
-#  $(LIBBITCOIN_CRYPTO) \
-#  $(LIBBITCOIN_UTIL) \
+EXTRA_LIBRARIES += $(LIBBITCOIN_UTIL) 
+
 #  $(LIBBITCOIN_COMMON) \
 #  $(LIBBITCOIN_CONSENSUS) \
 #  $(LIBBITCOIN_SERVER) \
 #  $(LIBBITCOIN_CLI) \
 #  $(LIBBITCOIN_WALLET) \
+#
 #  $(LIBBITCOIN_ZMQ)
 
+
 #lib_LTLIBRARIES = $(LIBBITCOINCONSENSUS)
 
 bin_PROGRAMS =
@@ -142,47 +143,33 @@ obj/build.h: FORCE
 #libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
 
 # server: shared between bitcoind and bitcoin-qt
-#libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
-#libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-#libbitcoin_server_a_SOURCES = \
-#  addrdb.cpp \
-#  addrman.cpp \
-#  bloom.cpp \
-#  blockencodings.cpp \
-#  chain.cpp \
-#  checkpoints.cpp \
-#  consensus/tx_verify.cpp \
-#  httprpc.cpp \
-#  httpserver.cpp \
-#  init.cpp \
-#  dbwrapper.cpp \
-#  merkleblock.cpp \
+#libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) libbitcoin_server_a_SOURCES = addrman.cpp \ alert.cpp \ beacon.cpp \ bitcoinrpc.cpp \ block.cpp \ boinc.cpp \ checkpoints.cpp \ cpid.cpp \ crypter.cpp \ db.cpp \ init.cpp \ irc.cpp \
+#  kernel.cpp \
+#  key.cpp \
+#  keystore.cpp \
+#  main.cpp \
 #  miner.cpp \
+#  netbase.cpp \
 #  net.cpp \
-#  net_processing.cpp \
 #  noui.cpp \
-#  policy/fees.cpp \
-#  policy/policy.cpp \
-#  policy/rbf.cpp \
-#  pow.cpp \
-#  rest.cpp \
-#  rpc/blockchain.cpp \
-#  rpc/mining.cpp \
-#  rpc/misc.cpp \
-#  rpc/net.cpp \
-#  rpc/rawtransaction.cpp \
-#  rpc/server.cpp \
-#  script/sigcache.cpp \
-#  script/ismine.cpp \
-#  timedata.cpp \
-#  torcontrol.cpp \
-#  txdb.cpp \
-#  txmempool.cpp \
-#  ui_interface.cpp \
-#  validation.cpp \
-#  validationinterface.cpp \
-#  versionbits.cpp \
-#  $(BITCOIN_CORE_H)
+#  pbkdf2.cpp \
+#  protocol.cpp \
+#  rpcblockchain.cpp \
+#  rpcdump.cpp \
+#  rpcmining.cpp \
+#  rpcnet.cpp \
+#  rpcrawtransaction.cpp \
+#  rpcwallet.cpp \
+#  script.cpp \
+#  scrypt.cpp \
+#  sync.cpp \
+#  txdb-leveldb.cpp \
+#  upgrader.cpp \
+#  util.cpp \
+#  version.cpp \
+#  wallet.cpp \
+#  walletdb.cpp \
+#  $(BITCOIN_CORE_H) 
 
 #if ENABLE_ZMQ
 #libbitcoin_zmq_a_CPPFLAGS = $(BITCOIN_INCLUDES) $(ZMQ_CFLAGS)
@@ -290,43 +277,9 @@ obj/build.h: FORCE
 # util: shared between all executables.
 # This library *must* be included to make sure that the glibc
 # backward-compatibility objects and their sanity checks are linked.
-#libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
-#libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-#libbitcoin_util_a_SOURCES = \
-#  support/lockedpool.cpp \
-#  chainparamsbase.cpp \
-#  clientversion.cpp \
-#  compat/glibc_sanity.cpp \
-#  compat/glibcxx_sanity.cpp \
-#  compat/strnlen.cpp \
-#  fs.cpp \
-#  random.cpp \
-#  rpc/protocol.cpp \
-#  support/cleanse.cpp \
-#  sync.cpp \
-#  threadinterrupt.cpp \
-#  util.cpp \
-#  utilmoneystr.cpp \
-#  utilstrencodings.cpp \
-#  utiltime.cpp \
-#  $(BITCOIN_CORE_H)
-
-#if GLIBC_BACK_COMPAT
-#libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
-#endif
-
-# cli: shared between bitcoin-cli and bitcoin-qt
-#libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
-#libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
-#libbitcoin_cli_a_SOURCES = \
-#  rpc/client.cpp \
-#  $(BITCOIN_CORE_H)
-
-#nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
-#
-
-# bitcoind binary #
-bitcoind_SOURCES = addrman.cpp \
+libbitcoin_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+libbitcoin_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+libbitcoin_util_a_SOURCES = addrman.cpp \
   alert.cpp \
   beacon.cpp \
   bitcoinrpc.cpp \
@@ -365,6 +318,61 @@ bitcoind_SOURCES = addrman.cpp \
   walletdb.cpp \
   $(BITCOIN_CORE_H)
 
+#if GLIBC_BACK_COMPAT
+#libbitcoin_util_a_SOURCES += compat/glibc_compat.cpp
+#endif
+
+# cli: shared between bitcoin-cli and bitcoin-qt
+#libbitcoin_cli_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+#libbitcoin_cli_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+#libbitcoin_cli_a_SOURCES = \
+#  rpc/client.cpp \
+#  $(BITCOIN_CORE_H)
+
+#nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
+#
+
+# bitcoind binary #
+bitcoind_SOURCES =
+#bitcoind_SOURCES = addrman.cpp \
+#  alert.cpp \
+#  beacon.cpp \
+#  bitcoinrpc.cpp \
+#  block.cpp \
+#  boinc.cpp \
+#  checkpoints.cpp \
+#  cpid.cpp \
+#  crypter.cpp \
+#  db.cpp \
+#  init.cpp \
+#  irc.cpp \
+#  kernel.cpp \
+#  key.cpp \
+#  keystore.cpp \
+#  main.cpp \
+#  miner.cpp \
+#  netbase.cpp \
+#  net.cpp \
+#  noui.cpp \
+#  pbkdf2.cpp \
+#  protocol.cpp \
+#  rpcblockchain.cpp \
+#  rpcdump.cpp \
+#  rpcmining.cpp \
+#  rpcnet.cpp \
+#  rpcrawtransaction.cpp \
+#  rpcwallet.cpp \
+#  script.cpp \
+#  scrypt.cpp \
+#  sync.cpp \
+#  txdb-leveldb.cpp \
+#  upgrader.cpp \
+#  util.cpp \
+#  version.cpp \
+#  wallet.cpp \
+#  walletdb.cpp \
+#  $(BITCOIN_CORE_H)
+
 bitcoind_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 bitcoind_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 bitcoind_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
@@ -374,18 +382,19 @@ bitcoind_SOURCES += bitcoind-res.rc
 endif
 
 bitcoind_LDADD = \
+ $(LIBBITCOIN_UTIL) \
  $(LIBLEVELDB) \
  $(LIBLEVELDB_SSE42) \
  $(LIBMEMENV)
-#  $(LIBBITCOIN_SERVER) \
-#  $(LIBBITCOIN_COMMON) \
-#  $(LIBUNIVALUE) \
-#  $(LIBBITCOIN_UTIL) \
-#  $(LIBBITCOIN_WALLET) \
-#  $(LIBBITCOIN_CONSENSUS) \
-#  $(LIBBITCOIN_CRYPTO) \
+#  $(LIBBITCOIN_WALLET)
+#  $(LIBBITCOIN_CONSENSUS)
+#  $(LIBBITCOIN_CRYPTO)
 #  $(LIBSECP256K1)
 #  $(LIBBITCOIN_ZMQ) 
+#  $(LIBBITCOIN_SERVER)
+#  $(LIBBITCOIN_COMMON)
+#  $(LIBUNIVALUE)
+
 
 bitcoind_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(CURL_LIBS)
 #bitcoind_LDADD += $(ZMQ_IBS)
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
index 36789aae0b..b6a270c039 100644
--- a/src/Makefile.qt.include
+++ b/src/Makefile.qt.include
@@ -3,11 +3,10 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 bin_PROGRAMS += qt/bitcoin-qt
-# EXTRA_LIBRARIES += qt/libbitcoinqt.a
+EXTRA_LIBRARIES += qt/libbitcoinqt.a
 
 # bitcoin qt core #
 QT_TS = \
-  qt/locale/bitcoin_af.ts \
   qt/locale/bitcoin_af_ZA.ts \
   qt/locale/bitcoin_ar.ts \
   qt/locale/bitcoin_be_BY.ts \
@@ -113,10 +112,10 @@ QT_FORMS_UI = \
 
 
 QT_MOC_CPP = \
+  qt/moc_aboutdialog.cpp \
   qt/moc_addressbookpage.cpp \
   qt/moc_addresstablemodel.cpp \
   qt/moc_askpassphrasedialog.cpp \
-  qt/moc_bantablemodel.cpp \
   qt/moc_bitcoinaddressvalidator.cpp \
   qt/moc_bitcoinamountfield.cpp \
   qt/moc_bitcoingui.cpp \
@@ -130,50 +129,55 @@ QT_MOC_CPP = \
   qt/moc_guiutil.cpp \
   qt/moc_macdockiconhandler.cpp \
   qt/moc_macnotificationhandler.cpp \
-  qt/moc_modaloverlay.cpp \
+  qt/moc_monitoreddatamapper.cpp \
   qt/moc_notificator.cpp \
-  qt/moc_openuridialog.cpp \
   qt/moc_optionsdialog.cpp \
   qt/moc_optionsmodel.cpp \
   qt/moc_overviewpage.cpp \
-  qt/moc_peertablemodel.cpp \
-  qt/moc_paymentserver.cpp \
   qt/moc_qvalidatedlineedit.cpp \
   qt/moc_qvaluecombobox.cpp \
-  qt/moc_receivecoinsdialog.cpp \
-  qt/moc_receiverequestdialog.cpp \
-  qt/moc_recentrequeststablemodel.cpp \
   qt/moc_rpcconsole.cpp \
   qt/moc_sendcoinsdialog.cpp \
   qt/moc_sendcoinsentry.cpp \
   qt/moc_signverifymessagedialog.cpp \
-  qt/moc_splashscreen.cpp \
   qt/moc_trafficgraphwidget.cpp \
   qt/moc_transactiondesc.cpp \
   qt/moc_transactiondescdialog.cpp \
   qt/moc_transactionfilterproxy.cpp \
   qt/moc_transactiontablemodel.cpp \
   qt/moc_transactionview.cpp \
-  qt/moc_utilitydialog.cpp \
-  qt/moc_walletframe.cpp \
-  qt/moc_walletmodel.cpp \
-  qt/moc_walletview.cpp
+  qt/moc_upgradedialog.cpp \
+  qt/moc_walletmodel.cpp
+
+#qt/moc_walletview.cpp
+#qt/moc_utilitydialog.cpp
+#qt/moc_walletframe.cpp
+#qt/moc_splashscreen.cpp
+#qt/moc_receivecoinsdialog.cpp
+#qt/moc_receiverequestdialog.cpp
+#qt/moc_recentrequeststablemodel.cpp
+#qt/moc_openuridialog.cpp
+#qt/moc_modaloverlay.cpp
+#qt/moc_peertablemodel.cpp
+#qt/moc_paymentserver.cpp
+
 
 BITCOIN_MM = \
   qt/macdockiconhandler.mm \
   qt/macnotificationhandler.mm
 
 QT_MOC = \
-  qt/bitcoin.moc \
   qt/bitcoinamountfield.moc \
   qt/callback.moc \
   qt/overviewpage.moc \
   qt/rpcconsole.moc
 
-QT_QRC_CPP = qt/qrc_bitcoin.cpp
-QT_QRC = qt/bitcoin.qrc
-QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
-QT_QRC_LOCALE = qt/bitcoin_locale.qrc
+#qt/bitcoin.moc
+
+#QT_QRC_CPP = qt/qrc_bitcoin.cpp
+#QT_QRC = qt/bitcoin.qrc
+#QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
+#QT_QRC_LOCALE = qt/bitcoin_locale.qrc
 
 # PROTOBUF_CC = qt/paymentrequest.pb.cc
 # PROTOBUF_H = qt/paymentrequest.pb.h
@@ -280,60 +284,59 @@ RES_ICONS = \
 
 BITCOIN_QT_BASE_CPP = \
   qt/aboutdialog.cpp \
-  qt/bitcoin.cpp \
+  qt/addressbookpage.cpp \
+  qt/addresstablemodel.cpp \
+  qt/askpassphrasedialog.cpp \
   qt/bitcoinaddressvalidator.cpp \
   qt/bitcoinamountfield.cpp \
   qt/bitcoingui.cpp \
   qt/bitcoinstrings.cpp \
   qt/bitcoinunits.cpp \
   qt/clientmodel.cpp \
+  qt/coincontroldialog.cpp \
+  qt/coincontroltreewidget.cpp \
   qt/csvmodelwriter.cpp \
+  qt/editaddressdialog.cpp \
   qt/guiutil.cpp \
   qt/monitoreddatamapper.cpp \
   qt/notificator.cpp \
   qt/optionsdialog.cpp \
   qt/optionsmodel.cpp \
+  qt/overviewpage.cpp \
   qt/qrcodedialog.cpp \
   qt/qtipcserver.cpp \
   qt/qvalidatedlineedit.cpp \
   qt/qvaluecombobox.cpp \
   qt/rpcconsole.cpp \
-  qt/trafficgraphwidget.cpp \
-  qt/upgradedialog.cpp \
-  qt/votingdialog.cpp
-
-BITCOIN_QT_WALLET_CPP = \
-  qt/addressbookpage.cpp \
-  qt/addresstablemodel.cpp \
-  qt/askpassphrasedialog.cpp \
-  qt/coincontroldialog.cpp \
-  qt/coincontroltreewidget.cpp \
-  qt/editaddressdialog.cpp \
-  qt/openuridialog.cpp \
-  qt/overviewpage.cpp \
-  qt/paymentrequestplus.cpp \
-  qt/paymentserver.cpp \
-  qt/receivecoinsdialog.cpp \
-  qt/receiverequestdialog.cpp \
-  qt/recentrequeststablemodel.cpp \
   qt/sendcoinsdialog.cpp \
   qt/sendcoinsentry.cpp \
   qt/signverifymessagedialog.cpp \
+  qt/trafficgraphwidget.cpp \
   qt/transactiondesc.cpp \
   qt/transactiondescdialog.cpp \
   qt/transactionfilterproxy.cpp \
   qt/transactionrecord.cpp \
   qt/transactiontablemodel.cpp \
   qt/transactionview.cpp \
+  qt/upgradedialog.cpp \
+  qt/votingdialog.cpp \
+  qt/walletmodel.cpp
+
+
+#BITCOIN_QT_WALLET_CPP = \
+  qt/paymentrequestplus.cpp \
+  qt/paymentserver.cpp \
+  qt/receivecoinsdialog.cpp \
+  qt/receiverequestdialog.cpp \
+  qt/recentrequeststablemodel.cpp \
   qt/walletframe.cpp \
-  qt/walletmodel.cpp \
   qt/walletmodeltransaction.cpp \
   qt/walletview.cpp
 
 BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
-if ENABLE_WALLET
-BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
-endif
+#if ENABLE_WALLET
+#BITCOIN_QT_CPP += $(BITCOIN_QT_WALLET_CPP)
+#endif
 
 RES_IMAGES = 
 
@@ -341,20 +344,18 @@ RES_MOVIES = $(wildcard $(srcdir)/qt/res/movies/spinner-*.png)
 
 BITCOIN_RC = qt/res/bitcoin-qt-res.rc
 
-# BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
-#   -I$(builddir)/qt/forms -DQT_NO_KEYWORDS
 BITCOIN_QT_INCLUDES = -I$(builddir)/qt -I$(srcdir)/qt -I$(srcdir)/qt/forms \
   -I$(builddir)/qt/forms
 
-# qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
-#   $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
-# qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
+qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
+  $(QT_INCLUDES) $(QT_DBUS_INCLUDES) $(PROTOBUF_CFLAGS) $(QR_CFLAGS)
+qt_libbitcoinqt_a_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
-# qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
-#   $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
+qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
+  $(QT_QRC) $(QT_QRC_LOCALE) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
 
-# nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
-#   $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
+nodist_qt_libbitcoinqt_a_SOURCES = $(QT_MOC_CPP) $(QT_MOC) $(PROTOBUF_CC) \
+  $(PROTOBUF_H) $(QT_QRC_CPP) $(QT_QRC_LOCALE_CPP)
 
 # forms/foo.h -> forms/ui_foo.h
 QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
@@ -362,12 +363,12 @@ QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:
 # Most files will depend on the forms and moc files as includes. Generate them
 # before anything else.
 $(QT_MOC): $(QT_FORMS_H)
-$(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC)
+$(qt_libbitcoinqt_a_OBJECTS) $(qt_bitcoin_qt_OBJECTS) : | $(QT_MOC)
 
 #Generating these with a half-written protobuf header leads to wacky results.
 #This makes sure it's done.
-# $(QT_MOC): $(PROTOBUF_H)
-# $(QT_MOC_CPP): $(PROTOBUF_H)
+#$(QT_MOC): $(PROTOBUF_H)
+#$(QT_MOC_CPP): $(PROTOBUF_H)
 
 # bitcoin-qt binary #
 qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
@@ -381,14 +382,15 @@ endif
 if TARGET_WINDOWS
   qt_bitcoin_qt_SOURCES += $(BITCOIN_RC)
 endif
-# qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a $(LIBBITCOIN_SERVER)
+qt_bitcoin_qt_LDADD = qt/libbitcoinqt.a
+#$(LIBBITCOIN_SERVER)
 # if ENABLE_WALLET
 # qt_bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
 # endif
 # if ENABLE_ZMQ
 # qt_bitcoin_qt_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
 # endif
-qt_bitcoin_qt_LDADD = $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
+qt_bitcoin_qt_LDADD += $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) \
   $(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(LIBSECP256K1) \
   $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS)
 qt_bitcoin_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
@@ -399,9 +401,10 @@ QT_QM=$(QT_TS:.ts=.qm)
 
 SECONDARY: $(QT_QM)
 
-# $(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) $(libbitcoin_util_a_SOURCES)
-# 	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
-# 	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
+#$(libbitcoin_server_a_SOURCES) $(libbitcoin_wallet_a_SOURCES) $(libbitcoin_common_a_SOURCES) $(libbitcoin_zmq_a_SOURCES) $(libbitcoin_consensus_a_SOURCES) 
+$(srcdir)/qt/bitcoinstrings.cpp: $(libbitcoin_util_a_SOURCES)
+	@test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
+	$(AM_V_GEN) cd $(srcdir); XGETTEXT=$(XGETTEXT) PACKAGE_NAME="$(PACKAGE_NAME)" COPYRIGHT_HOLDERS="$(COPYRIGHT_HOLDERS)" COPYRIGHT_HOLDERS_SUBSTITUTION="$(COPYRIGHT_HOLDERS_SUBSTITUTION)" $(PYTHON) ../share/qt/extract_strings_qt.py $^
 
 translate: $(srcdir)/qt/bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_BASE_CPP) qt/bitcoin.cpp $(BITCOIN_QT_WINDOWS_CPP) $(BITCOIN_QT_WALLET_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
 	@test -n $(LUPDATE) || echo "lupdate is required for updating translations"
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index 1c0d3bda87..c6824b086b 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -145,8 +145,8 @@ void AddressBookPage::setModel(AddressTableModel *model)
 
     ui->tableView->horizontalHeader()->resizeSection(
             AddressTableModel::Address, 320);
-    ui->tableView->horizontalHeader()->setResizeMode(
-            AddressTableModel::Label, QHeaderView::Stretch);
+    /* ui->tableView->horizontalHeader()->setResizeMode( */
+            /* AddressTableModel::Label, QHeaderView::Stretch); */
 
     connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SLOT(selectionChanged()));