diff --git a/sapl/comissoes/views.py b/sapl/comissoes/views.py
index a4f2463e0..0c95a4b7e 100644
--- a/sapl/comissoes/views.py
+++ b/sapl/comissoes/views.py
@@ -1,13 +1,16 @@
 import logging
 
 from django.core.urlresolvers import reverse
+from django.contrib import messages
+from django.contrib.auth.mixins import PermissionRequiredMixin
 from django.db.models import F
 from django.http.response import HttpResponseRedirect, JsonResponse
 from django.views.decorators.clickjacking import xframe_options_exempt
-from django.views.generic import ListView
+from django.views.generic import ListView, CreateView, DeleteView
 from django.views.generic.base import RedirectView
 from django.views.generic.detail import DetailView
-from django.views.generic.edit import FormMixin
+from django.views.generic.edit import FormMixin, UpdateView
+from django.utils.translation import ugettext_lazy as _
 
 from sapl.base.models import AppConfig as AppsAppConfig
 from sapl.comissoes.apps import AppConfig
@@ -15,11 +18,11 @@ from sapl.comissoes.forms import (ComissaoForm, ComposicaoForm,
                                   DocumentoAcessorioCreateForm,
                                   DocumentoAcessorioEditForm,
                                   ParticipacaoCreateForm, ParticipacaoEditForm,
-                                  PeriodoForm, ReuniaoForm)
+                                  PeriodoForm, ReuniaoForm, PautaReuniaoForm)
 from sapl.crud.base import (RP_DETAIL, RP_LIST, Crud, CrudAux,
                             MasterDetailCrud,
                             PermissionRequiredForAppCrudMixin)
-from sapl.materia.models import MateriaLegislativa, Tramitacao
+from sapl.materia.models import MateriaLegislativa, Tramitacao, PautaReuniao
 
 from .models import (CargoComissao, Comissao, Composicao, DocumentoAcessorio,
                      Participacao, Periodo, Reuniao, TipoComissao)
@@ -162,25 +165,28 @@ class ComissaoCrud(Crud):
             return super(Crud.UpdateView, self).form_valid(form)
 
 
+def lista_materias_comissao(comissao_pk):
+    ts = Tramitacao.objects.order_by(
+        'materia', '-data_tramitacao', '-id').annotate(
+        comissao=F('unidade_tramitacao_destino__comissao')).distinct(
+            'materia').values_list('materia', 'comissao')
+
+    ts = list(filter(lambda x: x[1] == int(comissao_pk), ts))
+    ts = list(zip(*ts))
+    ts = ts[0] if ts else []
+
+    materias = MateriaLegislativa.objects.filter(
+        pk__in=ts).order_by('tipo', '-ano', '-numero')
+
+    return materias
+
+
 class MateriasTramitacaoListView(ListView):
     template_name = "comissoes/materias_em_tramitacao.html"
     paginate_by = 10
 
     def get_queryset(self):
-        # FIXME: Otimizar consulta
-        ts = Tramitacao.objects.order_by(
-            'materia', '-data_tramitacao', '-id').annotate(
-            comissao=F('unidade_tramitacao_destino__comissao')).distinct(
-                'materia').values_list('materia', 'comissao')
-
-        ts = list(filter(lambda x: x[1] == int(self.kwargs['pk']), ts))
-        ts = list(zip(*ts))
-        ts = ts[0] if ts else []
-
-        materias = MateriaLegislativa.objects.filter(
-            pk__in=ts).order_by('tipo', '-ano', '-numero')
-
-        return materias
+        return lista_materias_comissao(self.kwargs['pk'])
 
     def get_context_data(self, **kwargs):
         context = super(
@@ -210,8 +216,19 @@ class ReuniaoCrud(MasterDetailCrud):
             docs.extend(documentos)
 
             context['docs'] = docs
-            context['n_docs'] = len(docs)
+            context['num_docs'] = len(docs)
+
+            mats = []
+            materias_pauta = PautaReuniao.objects.filter(reuniao=self.kwargs['pk'])
+            materias_pk = [materia_pauta.materia.pk for materia_pauta in materias_pauta]
+            
+            context['mats'] = MateriaLegislativa.objects.filter(
+                pk__in=materias_pk
+            ).order_by('tipo', '-ano', '-numero')
+            context['num_mats'] = len(context['mats'])
+
             context['reuniao_pk'] = self.kwargs['pk']
+            
             return context
 
     class ListView(MasterDetailCrud.ListView):
@@ -263,6 +280,98 @@ class ReuniaoCrud(MasterDetailCrud):
             return {'comissao': comissao}
 
 
+class RemovePautaView(PermissionRequiredMixin, CreateView):
+    model = PautaReuniao
+    form_class = PautaReuniaoForm
+    template_name = 'comissoes/pauta.html'
+    permission_required = ('comissoes.add_reuniao', )
+
+    def get_context_data(self, **kwargs):
+        context = super(
+            RemovePautaView, self
+        ).get_context_data(**kwargs)
+
+        # Remove = 0; Adiciona = 1
+        context['opcao'] = 0
+
+        context['object'] = Reuniao.objects.get(pk=self.kwargs['pk'])
+        context['root_pk'] = context['object'].comissao.pk
+
+        materias_pauta = PautaReuniao.objects.filter(reuniao=context['object'])
+        materias_pk = [materia_pauta.materia.pk for materia_pauta in materias_pauta]
+        
+        context['materias'] = MateriaLegislativa.objects.filter(
+            pk__in=materias_pk
+        ).order_by('tipo', '-ano', '-numero') 
+        context['num_materias'] = len(context['materias'])
+
+        return context
+
+    def post(self, request, *args, **kwargs):
+        success_url = reverse('sapl.comissoes:reuniao_detail', kwargs={'pk':kwargs['pk']})
+        marcadas = request.POST.getlist('materia_id')
+
+        if len(marcadas) == 0:
+            msg=_('Nenhuma matéria foi selecionada.')
+            messages.add_message(request, messages.WARNING, msg)
+            return HttpResponseRedirect(success_url)
+
+        reuniao = Reuniao.objects.get(pk=kwargs['pk'])
+        for materia in MateriaLegislativa.objects.filter(id__in=marcadas):
+            PautaReuniao.objects.get(reuniao=reuniao,materia=materia).delete()
+
+        msg=_('Matéria(s) removida(s) com sucesso!')
+        messages.add_message(request, messages.SUCCESS, msg)
+        return HttpResponseRedirect(success_url)
+
+
+class AdicionaPautaView(PermissionRequiredMixin, CreateView):
+    model = PautaReuniao
+    form_class = PautaReuniaoForm
+    template_name = 'comissoes/pauta.html'
+    permission_required = ('comissoes.add_reuniao', )
+
+    def get_context_data(self, **kwargs):
+        context = super(
+            AdicionaPautaView, self
+        ).get_context_data(**kwargs)
+
+        # Adiciona = 1; Remove = 0
+        context['opcao'] = 1
+
+        context['object'] = Reuniao.objects.get(pk=self.kwargs['pk'])
+        context['root_pk'] = context['object'].comissao.pk
+
+        materias_comissao = lista_materias_comissao(context['object'].comissao.pk)
+        materias_pauta = PautaReuniao.objects.filter(reuniao=context['object'])
+
+        nao_listar = [mp.materia.pk for mp in materias_pauta]
+        context['materias'] = materias_comissao.exclude(pk__in=nao_listar)
+        context['num_materias'] = len(context['materias'])
+
+        return context
+    
+    def post(self, request, *args, **kwargs):
+        success_url = reverse('sapl.comissoes:reuniao_detail', kwargs={'pk':kwargs['pk']}) 
+        marcadas = request.POST.getlist('materia_id')
+
+        if len(marcadas) == 0:
+            msg = _('Nenhuma máteria foi selecionada.')
+            messages.add_message(request, messages.WARNING, msg)
+            return HttpResponseRedirect(success_url)
+            
+        reuniao = Reuniao.objects.get(pk=kwargs['pk'])
+        for materia in MateriaLegislativa.objects.filter(id__in=marcadas):
+            pauta = PautaReuniao()
+            pauta.reuniao = reuniao
+            pauta.materia = materia
+            pauta.save()
+        
+        msg = _('Matéria(s) adicionada(s) com sucesso!')
+        messages.add_message(request, messages.SUCCESS, msg)
+        return HttpResponseRedirect(success_url)
+
+
 class DocumentoAcessorioCrud(MasterDetailCrud):
     model = DocumentoAcessorio
     parent_field = 'reuniao__comissao'
diff --git a/sapl/templates/comissoes/pauta.html b/sapl/templates/comissoes/pauta.html
new file mode 100644
index 000000000..757c4cf86
--- /dev/null
+++ b/sapl/templates/comissoes/pauta.html
@@ -0,0 +1,68 @@
+{% extends "crud/detail.html" %}
+{% load i18n crispy_forms_tags %}
+{% block actions %}{% endblock %}
+
+{% block title %}
+	<h1 class="page-header">
+        {% if opcao %}
+            Adicionar Matérias à Pauta <small>(Reunião: {{object}})</small>
+        {% else %}
+            Remover Matérias da Pauta <small>(Reunião: {{object}})</small>
+        {% endif %}
+	</h1>
+{% endblock %}
+
+{% block detail_content %}
+    {% if materias %}
+        {% if num_materias == 1 %}
+            <b>Há {{num_materias}} matéria disponível.</b> <br><br>
+        {% else %}
+            <b>Há {{num_materias}} matérias disponíveis.</b> <br><br>
+        {% endif %}
+        <form method="POST" enctype="multipart/form-data">
+            {% csrf_token %}
+            <fieldset>
+                <table class="table table-striped table-hover">
+                    <div class="controls">
+                        <div class="checkbox">
+                            <label for="id_check_all">
+                                <input type="checkbox" id="id_check_all" onchange="checkAll(this)" /> Marcar/Desmarcar Todos
+                            </label>
+                        </div>
+                    </div>
+                    <thead>
+                        <tr><th>Matéria</th></tr>
+                    </thead>
+                    <tbody onload="checks(materias_checked)">
+                        {% for materia in materias %}
+                            <tr>
+                                <td>
+                                    <input type="checkbox" name="materia_id" value="{{materia.id}}" {% if check %} checked {% endif %}/>
+                                    {{materia.tipo.sigla}} {{materia.numero}}/{{materia.ano}} - {{materia.tipo.descricao}}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </fieldset>
+            {% if opcao %}
+                <input type="submit" value="Salvar" class="btn btn-primary"S>
+            {% else %}
+                <input type="submit" value="Remover" class="btn btn-danger"S>
+            {% endif %}
+        </form>
+    {% else %}
+        <b>Não há matéria disponível.</b> <br><br>
+    {% endif %}
+{% endblock %}
+{% block extra_js %}
+        <script language="JavaScript">
+            function checkAll(elem){
+                let checkboxes = document.getElementsByName('materia_id');
+                for(let i=0; i<checkboxes.length; i++){
+                    if(checkboxes[i].type == 'checkbox')
+                        checkboxes[i].checked = elem.checked
+                }
+            }
+        </script>
+{% endblock %}