diff --git a/device.mk b/device.mk
index 785e214..1749f95 100644
--- a/device.mk
+++ b/device.mk
@@ -20,11 +20,25 @@ $(call inherit-product-if-exists, vendor/samsung/gts28velte/gts28velte-vendor.mk
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
+# Permissions
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.telephony.cdma.xml:system/etc/permissions/android.hardware.telephony.cdma.xml \
+    frameworks/native/data/etc/android.hardware.telephony.gsm.xml:system/etc/permissions/android.hardware.telephony.gsm.xml
+
 # Audio configuration
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \
     $(LOCAL_PATH)/audio/mixer_paths_wcd9330.xml:system/etc/mixer_paths_wcd9330.xml
 
+# Device init scripts
+PRODUCT_PACKAGES += \
+    init.target.rc
+
+# Radio
+PRODUCT_PACKAGES += \
+    librmnetctl \
+    libshims_rild_socket
+
 # Vibrator
 PRODUCT_PACKAGES += \
     android.hardware.vibrator@1.0-impl
diff --git a/full_gts28velte.mk b/full_gts28velte.mk
index 3c52b3c..6f93a75 100644
--- a/full_gts28velte.mk
+++ b/full_gts28velte.mk
@@ -16,7 +16,7 @@
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from gts28velte device
 $(call inherit-product, device/samsung/gts28velte/device.mk)
diff --git a/lineage.mk b/lineage.mk
index 8b1f590..0c1673e 100644
--- a/lineage.mk
+++ b/lineage.mk
@@ -1,7 +1,7 @@
 $(call inherit-product, device/samsung/gts28velte/full_gts28velte.mk)
 
 # Inherit some common Lineage stuff.
-$(call inherit-product, vendor/lineage/config/common_full_tablet_wifionly.mk)
+$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 PRODUCT_NAME := lineage_gts28velte
 PRODUCT_BRAND := samsung
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 57419f2..1768445 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -18,12 +18,6 @@
 -->
 
 <resources>
-    <!-- This device is not "voice capable"; it's data-only. -->
-    <bool name="config_voice_capable">false</bool>
-
-    <!-- This device does not allow sms service. -->
-    <bool name="config_sms_capable">false</bool>
-
     <!-- This string array should be overridden by the device to present a list of network
          attributes.  This is used by the connectivity manager to decide which networks can coexist
          based on the hardware -->
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 68381f3..4544893 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,3 +1,26 @@
+# Radio
+bin/netmgrd:vendor/bin/netmgrd
+bin/qmuxd:vendor/bin/qmuxd
+bin/radish:vendor/bin/radish
+etc/data/netmgr_config.xml|fb65247a5c492d7152a36bf4fb381804649dd384
+etc/data/qmi_config.xml|af9655ffd4c108d4061a79aadf620b9b44f24f26
+lib64/libfloatingfeature.so
+lib64/libsec-ril.so|305d1a8aedc85bed7452634a999b8628affe25bb
+lib/libfloatingfeature.so
+lib/libsec-ril.so
+vendor/lib64/libcneapiclient.so|2cad1813fcf903b1aa45b33f4997b1c495925367
+vendor/lib64/libconfigdb.so
+vendor/lib64/libnetmgr.so
+vendor/lib64/libprotobuf-cpp-N.so|3f29ae846766006db33cf5186a08eb8b22823eba
+vendor/lib64/libril-qcril-hook-oem.so
+vendor/lib64/libsystem_health_mon.so
+vendor/lib64/libxml.so
+vendor/lib/libconfigdb.so
+vendor/lib/libnetmgr.so
+vendor/lib/libril-qcril-hook-oem.so
+vendor/lib/libsystem_health_mon.so
+vendor/lib/libxml.so
+
 # Sensors
 lib64/hw/sensors.msm8952.so
 vendor/lib64/libsensor1.so
diff --git a/rootdir/Android.mk b/rootdir/Android.mk
new file mode 100644
index 0000000..b9014f9
--- /dev/null
+++ b/rootdir/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH:= $(call my-dir)
+
+# Device init scripts
+
+include $(CLEAR_VARS)
+LOCAL_MODULE       := init.target.rc
+LOCAL_MODULE_TAGS  := optional eng
+LOCAL_MODULE_CLASS := ETC
+LOCAL_SRC_FILES    := etc/init.target.rc
+LOCAL_MODULE_PATH  := $(TARGET_ROOT_OUT)
+include $(BUILD_PREBUILT)
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
new file mode 100644
index 0000000..eef8e6c
--- /dev/null
+++ b/rootdir/etc/init.target.rc
@@ -0,0 +1,37 @@
+# Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of The Linux Foundation nor the names of its
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+#
+
+# QMUX must be in multiple groups to support external process connections
+service qmuxd /vendor/bin/qmuxd
+    class main
+    user root
+    group radio audio bluetooth gps oem_2950 wakelock
+
+service netmgrd /vendor/bin/netmgrd
+    class main
+    group wakelock
diff --git a/system.prop b/system.prop
index 4061523..b377002 100644
--- a/system.prop
+++ b/system.prop
@@ -10,4 +10,12 @@ ro.qualcomm.bluetooth.opp=true
 ro.qualcomm.bluetooth.pbap=true
 
 # Radio
-ro.radio.noril=yes
+persist.data.netmgrd.qos.enable=true
+persist.data.qmi.adb_logmask=0
+persist.radio.add_power_save=1
+rild.libpath=/system/lib64/libsec-ril.so
+ro.telephony.mms_data_profile=5
+ro.ril.telephony.qan_resp_strings=6
+
+# Ril sends only one RIL_UNSOL_CALL_RING, so set call_ring.multiple to false
+ro.telephony.call_ring.multiple=0