diff --git a/smtp.services.yml b/smtp.services.yml
new file mode 100644
index 0000000..f18787d
--- /dev/null
+++ b/smtp.services.yml
@@ -0,0 +1,5 @@
+services:
+  smtp.logger.channel:
+    class: Drupal\Core\Logger\LoggerChannel
+    factory: logger.factory:get
+    arguments: ['smtp']
\ No newline at end of file
diff --git a/src/Plugin/Mail/SMTPMailSystem.php b/src/Plugin/Mail/SMTPMailSystem.php
index ea884a1..859ee8d 100644
--- a/src/Plugin/Mail/SMTPMailSystem.php
+++ b/src/Plugin/Mail/SMTPMailSystem.php
@@ -10,12 +10,16 @@ namespace Drupal\smtp\Plugin\Mail;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Mail\MailInterface;
 use Drupal\Core\Mail\MailFormatHelper;
-use Drupal\smtp\PHPMailer\PHPMailer;
+use PHPMailer;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
 
 /**
  * Modify the drupal mail system to use smtp when sending emails.
  * Include the option to choose between plain text or HTML
  *
+ *
  * @Mail(
  *   id = "SMTPMailSystem",
  *   label = @Translation("SMTP Mailer"),
@@ -27,10 +31,20 @@ class SMTPMailSystem implements MailInterface {
   protected $smtpConfig;
 
   /**
+   * Logger
+   *
+   * @var LoggerInterface
+   */
+  protected $logger;
+
+  /**
    * Constructs a SMPTMailSystem object.
+   * @internal param $smtpConfig
+   * @param $logger
    */
-  public function __construct() {
-    $this->smtpConfig = \Drupal::config('smtp.settings');
+  public function __construct($logger) {
+      $this->smtpConfig = \Drupal::config('smtp.settings');
+      $this->logger = $logger;
   }
 
   /**
@@ -74,7 +88,7 @@ class SMTPMailSystem implements MailInterface {
     $headers = $message['headers'];
     $subject = $message['subject'];
 
-    // Create a new PHPMailer object - autoloaded from registry.
+    // Create a new PHPMailer object - autoloaded from composer.
     $mailer = new PHPMailer();
 
     // Turn on debugging, if requested.
@@ -112,7 +126,7 @@ class SMTPMailSystem implements MailInterface {
         // If smtp_from config option is blank, use site_email.
         if (($from = $this->smtpConfig->get('site_mail')) == '') {
           drupal_set_message(t('There is no submitted from address.'), 'error');
-          watchdog('smtp', 'There is no submitted from address.', array(), WATCHDOG_ERROR);
+          $this->logger->error('There is no submitted from address.');
           return FALSE;
         }
       }
@@ -122,7 +136,7 @@ class SMTPMailSystem implements MailInterface {
 
     if (!\Drupal::service('email.validator')->isValid($from_comp['email'])) {
       drupal_set_message(t('The submitted from address (@from) is not valid.', array('@from' => $from)), 'error');
-      watchdog('smtp', 'The submitted from address (@from) is not valid.', array('@from' => $from), WATCHDOG_ERROR);
+      $this->logger->error(t('The submitted from address (@from) is not valid.'), array('@from' => $from));
       return FALSE;
     }
 
@@ -209,7 +223,7 @@ class SMTPMailSystem implements MailInterface {
             default:
               // Everything else is unsuppored by PHPMailer.
               drupal_set_message(t('The %header of your message is not supported by PHPMailer and will be sent as text/plain instead.', array('%header' => "Content-Type: $value")), 'error');
-              watchdog('smtp', 'The %header of your message is not supported by PHPMailer and will be sent as text/plain instead.', array('%header' => "Content-Type: $value"), WATCHDOG_ERROR);
+              $this->logger->error(t('The %header of your message is not supported by PHPMailer and will be sent as text/plain instead.', array('%header' => "Content-Type: $value")));
 
               // Force the Content-Type to be text/plain.
               $mailer->IsHTML(FALSE);
@@ -488,7 +502,7 @@ class SMTPMailSystem implements MailInterface {
       'from' => $from,
     );
     if ($this->smtpConfig->get('smtp_queue')) {
-      watchdog('smtp', 'Queue sending mail to: @to', array('@to' => $to));
+      $this->logger->info(t('Queue sending mail to: @to', array('@to' => $to)));
       smtp_send_queue($mailerArr);
     }
     else {