diff --git a/filebeat/input/mqtt/client.go b/filebeat/input/mqtt/client.go
new file mode 100644
index 00000000000..9f09c1ce0a4
--- /dev/null
+++ b/filebeat/input/mqtt/client.go
@@ -0,0 +1,207 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package mqtt
+
+import (
+	"crypto/tls"
+	"crypto/x509"
+	"encoding/json"
+	"io/ioutil"
+	"strings"
+	"time"
+
+	"github.com/elastic/beats/libbeat/beat"
+	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/logp"
+	"gopkg.in/vmihailenco/msgpack.v2"
+
+	MQTT "github.com/eclipse/paho.mqtt.golang"
+)
+
+func (input *mqttInput) newTLSConfig() (*tls.Config, error) {
+	config := input.config
+
+	// Import trusted certificates from CAfile.pem.
+	// Alternatively, manually add CA certificates to
+	// default openssl CA bundle.
+	certpool := x509.NewCertPool()
+	if config.CA != "" {
+		logp.Info("[MQTT] Set the CA")
+		pemCerts, err := ioutil.ReadFile(config.CA)
+		if err != nil {
+			return nil, err
+		}
+		certpool.AppendCertsFromPEM(pemCerts)
+	}
+
+	tlsconfig := &tls.Config{
+		// RootCAs = certs used to verify server cert.
+		RootCAs: certpool,
+		// ClientAuth = whether to request cert from server.
+		// Since the server is set up for SSL, this happens
+		// anyways.
+		ClientAuth: tls.NoClientCert,
+		// ClientCAs = certs used to validate client cert.
+		ClientCAs: nil,
+		// InsecureSkipVerify = verify that cert contents
+		// match server. IP matches what is in cert etc.
+		InsecureSkipVerify: true,
+	}
+
+	// Import client certificate/key pair
+	if config.ClientCert != "" && config.ClientKey != "" {
+		logp.Info("[MQTT] Set the Certs")
+		cert, err := tls.LoadX509KeyPair(config.ClientCert, config.ClientKey)
+		if err != nil {
+			return nil, err
+		}
+
+		// Certificates = list of certs client sends to server.
+		tlsconfig.Certificates = []tls.Certificate{cert}
+	}
+
+	// Create tls.Config with desired tls properties
+	return tlsconfig, nil
+}
+
+// Prepare MQTT client
+func (input *mqttInput) setupMqttClient() error {
+	c := input.config
+
+	logp.Info("[MQTT] Connect to broker URL: %s", c.Host)
+
+	mqttClientOpt := MQTT.NewClientOptions()
+	mqttClientOpt.SetClientID(c.ClientID)
+	mqttClientOpt.AddBroker(c.Host)
+
+	mqttClientOpt.SetMaxReconnectInterval(1 * time.Second)
+	mqttClientOpt.SetConnectionLostHandler(input.connectionLostHandler)
+	mqttClientOpt.SetOnConnectHandler(input.subscribeOnConnect)
+	mqttClientOpt.SetAutoReconnect(true)
+
+	if c.Username != "" {
+		logp.Info("[MQTT] Broker username: %s", c.Username)
+		mqttClientOpt.SetUsername(c.Username)
+	}
+
+	if c.Password != "" {
+		mqttClientOpt.SetPassword(c.Password)
+	}
+
+	if c.SSL == true {
+		logp.Info("[MQTT] Configure session to use SSL")
+		tlsconfig, err := input.newTLSConfig()
+		if err != nil {
+			return err
+		}
+		mqttClientOpt.SetTLSConfig(tlsconfig)
+	}
+
+	input.client = MQTT.NewClient(mqttClientOpt)
+	return nil
+}
+
+func (input *mqttInput) connect() error {
+	if token := input.client.Connect(); token.WaitTimeout(input.config.WaitClose) && token.Error() != nil {
+		logp.Err("MQTT Failed to connect")
+		return token.Error()
+	}
+	logp.Info("MQTT Client connected: %t", input.client.IsConnected())
+	return nil
+}
+
+func (input *mqttInput) subscribeOnConnect(client MQTT.Client) {
+	subscriptions := prepareSubscriptionsForTopics(input.config.Topics, input.config.QoS)
+
+	// Mqtt client - Subscribe to every topic in the config file, and bind with message handler
+	if token := input.client.SubscribeMultiple(subscriptions, input.onMessage); token.WaitTimeout(input.config.WaitClose) && token.Error() != nil {
+		logp.Error(token.Error())
+	}
+	logp.Info("MQTT Subscribed to configured topics")
+}
+
+// Mqtt message handler
+func (input *mqttInput) onMessage(client MQTT.Client, msg MQTT.Message) {
+	logp.Debug("MQTT", "MQTT message received: %s", string(msg.Payload()))
+	var beatEvent beat.Event
+	eventFields := make(common.MapStr)
+
+	// default case
+	var mqtt = make(common.MapStr)
+	eventFields["message"] = string(msg.Payload())
+	if input.config.DecodePayload {
+		mqtt["fields"] = decodeBytes(msg.Payload())
+	}
+
+	eventFields["is_system_topic"] = strings.HasPrefix(msg.Topic(), "$")
+	eventFields["topic"] = msg.Topic()
+
+	mqtt["id"] = msg.MessageID()
+	mqtt["retained"] = msg.Retained()
+	eventFields["mqtt"] = mqtt
+
+	// Finally sending the message to elasticsearch
+	beatEvent.Fields = eventFields
+	input.outlet.OnEvent(beatEvent)
+
+	logp.Debug("MQTT", "Event sent: %t")
+}
+
+// connectionLostHandler will try to reconnect when connection is lost
+func (input *mqttInput) connectionLostHandler(client MQTT.Client, reason error) {
+	logp.Warn("[MQTT] Connection lost: %s", reason.Error())
+
+	//Rerun the input
+	input.Run()
+}
+
+// decodeBytes will try to decode the bytes in the following order
+// 1.) Check for msgpack format
+// 2.) Check for json format
+// 3.) If every check fails, it will
+// return the the string representation
+func decodeBytes(payload []byte) common.MapStr {
+	event := make(common.MapStr)
+
+	// A msgpack payload must be a json-like object
+	err := msgpack.Unmarshal(payload, &event)
+	if err == nil {
+		logp.Debug("MQTT", "Payload decoded - msgpack")
+		return event
+	}
+
+	err = json.Unmarshal(payload, &event)
+	if err == nil {
+		logp.Debug("MQTT", "Payload decoded - as json")
+		return event
+	}
+
+	logp.Debug("MQTT", "decoded - as text")
+	return event
+}
+
+// ParseTopics will parse the config file and return a map with topic:QoS
+func prepareSubscriptionsForTopics(topics []string, qos int) map[string]byte {
+	subscriptions := make(map[string]byte)
+	for _, value := range topics {
+		// Finally, filling the subscriptions map
+		subscriptions[value] = byte(qos)
+		logp.Info("Subscribe to %v with QoS %v", value, qos)
+	}
+	return subscriptions
+}
diff --git a/filebeat/input/mqtt/config.go b/filebeat/input/mqtt/config.go
new file mode 100644
index 00000000000..9be3ef6103e
--- /dev/null
+++ b/filebeat/input/mqtt/config.go
@@ -0,0 +1,75 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package mqtt
+
+import (
+	"errors"
+	"fmt"
+	"time"
+)
+
+type mqttInputConfig struct {
+	Host           string        `config:"host"`
+	Topics         []string      `config:"topics"`
+	Username       string        `config:"user"`
+	Password       string        `config:"password"`
+	QoS            int           `config:"QoS"`
+	DecodePayload  bool          `config:"decode_payload"`
+	SSL            bool          `config:"ssl"`
+	CA             string        `config:"CA"`
+	ClientCert     string        `config:"clientCert"`
+	ClientKey      string        `config:"clientKey"`
+	ClientID       string        `config:"clientID"`
+	WaitClose      time.Duration `config:"wait_close" validate:"min=0"`
+	ConnectBackoff time.Duration `config:"connect_backoff" validate:"min=0"`
+}
+
+// The default config for the mqtt input
+func defaultConfig() mqttInputConfig {
+	return mqttInputConfig{
+		Host:           "localhost",
+		Topics:         []string{"#"},
+		ClientID:       "Filebeat",
+		Username:       "",
+		Password:       "",
+		DecodePayload:  true,
+		QoS:            0,
+		SSL:            false,
+		CA:             "",
+		ClientCert:     "",
+		ClientKey:      "",
+		WaitClose:      5 * time.Second,
+		ConnectBackoff: 30 * time.Second,
+	}
+}
+
+// Validate validates the config.
+func (c *mqttInputConfig) Validate() error {
+	if c.Host == "" {
+		return errors.New("no host configured")
+	}
+
+	if c.Username != "" && c.Password == "" {
+		return fmt.Errorf("password must be set when username is configured")
+	}
+
+	if len(c.ClientID) > 23 || len(c.ClientID) < 1 {
+		return fmt.Errorf("client id must be between 1 and 23 characters long")
+	}
+	return nil
+}
diff --git a/filebeat/input/mqtt/input.go b/filebeat/input/mqtt/input.go
new file mode 100644
index 00000000000..e8253d901ab
--- /dev/null
+++ b/filebeat/input/mqtt/input.go
@@ -0,0 +1,130 @@
+// Licensed to Elasticsearch B.V. under one or more contributor
+// license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright
+// ownership. Elasticsearch B.V. licenses this file to you under
+// the Apache License, Version 2.0 (the "License"); you may
+// not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package mqtt
+
+import (
+	"sync"
+
+	"github.com/elastic/beats/filebeat/channel"
+	"github.com/elastic/beats/filebeat/input"
+	"github.com/elastic/beats/libbeat/beat"
+	"github.com/elastic/beats/libbeat/common"
+	"github.com/elastic/beats/libbeat/common/backoff"
+	"github.com/elastic/beats/libbeat/logp"
+
+	"github.com/pkg/errors"
+
+	MQTT "github.com/eclipse/paho.mqtt.golang"
+)
+
+func init() {
+	err := input.Register("mqtt", NewInput)
+	if err != nil {
+		panic(err)
+	}
+}
+
+// Input contains the input and its config
+type mqttInput struct {
+	config        mqttInputConfig
+	context       input.Context
+	outlet        channel.Outleter
+	log           *logp.Logger
+	mqttWaitGroup sync.WaitGroup
+	runOnce       sync.Once
+	client        MQTT.Client
+}
+
+// NewInput creates a new mqtt input
+func NewInput(
+	cfg *common.Config,
+	connector channel.Connector,
+	inputContext input.Context,
+) (input.Input, error) {
+
+	config := defaultConfig()
+	if err := cfg.Unpack(&config); err != nil {
+		return nil, errors.Wrap(err, "reading mqtt input config")
+	}
+
+	out, err := connector.ConnectWith(cfg, beat.ClientConfig{
+		Processing: beat.ProcessingConfig{
+			DynamicFields: inputContext.DynamicFields,
+		},
+		//		ACKEvents: func(events []interface{}) {
+		//			for _, event := range events {
+		//				if meta, ok := event.(eventMeta); ok {
+		//					meta.handler.ack(meta.message)
+		//				}
+		//			}
+		//		},
+		WaitClose: config.WaitClose,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	input := &mqttInput{
+		config:  config,
+		context: inputContext,
+		outlet:  out,
+		log:     logp.NewLogger("mqtt input").With("host", config.Host),
+	}
+
+	err = input.setupMqttClient()
+	if err != nil {
+		return nil, err
+	}
+
+	return input, nil
+}
+
+// Run starts the input by scanning for incoming messages and errors.
+func (input *mqttInput) Run() {
+	input.runOnce.Do(func() {
+		go func() {
+
+			// If the consumer fails to connect, we use exponential backoff with
+			// jitter up to 8 * the initial backoff interval.
+			backoff := backoff.NewEqualJitterBackoff(
+				input.context.Done,
+				input.config.ConnectBackoff,
+				8*input.config.ConnectBackoff)
+
+			for !input.client.IsConnected() {
+				err := input.connect()
+				if err != nil {
+					logp.Error(err)
+					backoff.Wait()
+				}
+			}
+			//All the rest is working asynchronously within the MQTT client
+		}()
+	})
+}
+
+// Stop disconnects the MQTT client
+func (input *mqttInput) Stop() {
+	input.client.Disconnect(250)
+}
+
+// Wait should shut down the input and wait for it to complete
+// The disconnect of the client will do this for us
+func (input *mqttInput) Wait() {
+	input.Stop()
+}